Merge pull request #45 from ToddHossack/tki-past-events-fix

Revised EventsForm to use more comprehensive past events query
titledk · Nov 22, 2017 · afba392 · afba392
2 parents 5871861 + 8022f17
commit afba392
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/code/admin/forms/EventsForm.php b/code/admin/forms/EventsForm.php
@@ -68,8 +68,14 @@ public function __construct($controller, $name)
             'Root.Past', _t('Event.PAST_EVENT_PLURAL','Past events')
         );
 
+        // Find all past events, including those with null start time
+        $time = date('Y-m-d', time());
+        $pastEvents = PublicEvent::get()
+            ->where("\"StartDateTime\" < '$time' OR \"StartDateTime\" IS NULL")
+            ->sort('StartDateTime DESC');
+
         $pastGridField = GridField::create('PastEvents', '',
-            CalendarHelper::past_events()->sort('StartDateTime DESC'),
+            $pastEvents,
             $gridConfig);
 
         $fields->addFieldToTab('Root.Past',$pastGridField);