diff --git a/README.md b/README.md new file mode 100644 index 0000000..425f206 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +silverstripe-event-calendar +=========================== + +The Event Calendar module for SilverStripe + +Fixes for Announcements not filtering correctly diff --git a/code/Calendar.php b/code/Calendar.php index ff016c3..5b8db68 100755 --- a/code/Calendar.php +++ b/code/Calendar.php @@ -179,11 +179,9 @@ public function getEventList($start, $end, $filter = null, $limit = null, $annou $announcements = DataList::create($this->getAnnouncementClass()) ->filter(array( - "CalendarID" => $calendar->ID - )) - ->exclude(array( - "StartDate:LessThan" => $start, - "EndDate:GreaterThan" => $end, + "CalendarID" => $calendar->ID, + "StartDate:LessThan:Not" => $start, + "EndDate:GreaterThan:Not" => $end, )); if($announcement_filter) { $announcements = $announcements->where($announcement_filter); @@ -411,7 +409,7 @@ public function UpcomingEvents($limit = 5, $filter = null) { public function UpcomingAnnouncements($limit = 5, $filter = null) { return $this->Announcements() ->filter(array( - 'StartDate:GreaterThan' => 'DATE(NOW())' + 'StartDate:GreaterThan' => 'NOW' )) ->where($filter) ->limit($limit);