From 67cc69d705e3be4941bef323970842d1f918aabc Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Thu, 1 Nov 2018 12:00:48 +0000 Subject: [PATCH] Mark event start date as required and refactor formRule --- CRM/Event/Form/ManageEvent/EventInfo.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php index ebc68876f4..4ca39edf26 100644 --- a/CRM/Event/Form/ManageEvent/EventInfo.php +++ b/CRM/Event/Form/ManageEvent/EventInfo.php @@ -173,7 +173,7 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent { $this->addElement('checkbox', 'is_share', ts('Allow sharing through social media?')); $this->addElement('checkbox', 'is_map', ts('Include Map to Event Location')); - $this->add('datepicker', 'start_date', ts('Start'), [], FALSE, ['time' => TRUE]); + $this->add('datepicker', 'start_date', ts('Start'), [], !$this->_isTemplate, ['time' => TRUE]); $this->add('datepicker', 'end_date', ts('End'), [], FALSE, ['time' => TRUE]); $this->add('text', 'max_participants', ts('Max Number of Participants'), @@ -210,15 +210,8 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent { public static function formRule($values) { $errors = array(); - if (!$values['is_template']) { - if (empty($values['start_date'])) { - $errors['start_date'] = ts('Start Date and Time are required fields'); - } - else { - if (($values['end_date'] < $values['start_date']) && !empty($values['end_date'])) { - $errors['end_date'] = ts('End date should be after Start date.'); - } - } + if (!empty($values['end_date']) && ($values['end_date'] < $values['start_date'])) { + $errors['end_date'] = ts('End date should be after Start date.'); } //CRM-4286 -- 2.25.1