Handle date field conversion, don't call normalize twice

civicrm · Jan 4, 2019 · e1be97f · e1be97f
1 parent e897889
commit e1be97f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
@@ -203,7 +203,6 @@ public function setDefaultValues() {
       'privacy_toggle' => 1,
       'operator' => 'AND',
     ));
-    $this->normalizeDefaultValues($defaults);
 
     if ($this->_context === 'amtg') {
       $defaults['task'] = CRM_Contact_Task::GROUP_ADD;

diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
@@ -356,4 +356,27 @@ protected function loadFormValues() {
     }
   }
 
+  /**
+   * Do form value conversions based on form metadata.
+   */
+  public function convertFormValues() {
+    $metadata = $this->getSearchFieldMetadata();
+    foreach ($metadata as $fields) {
+      foreach ($fields as $field => $spec) {
+        if ($spec['type'] == CRM_Utils_Type::T_DATE) {
+          if (isset($this->_formValues[$field . '_low'])) {
+            if (date('Y-m-d H:i:s', strtotime($this->_formValues[$field . '_low'])) !== $this->_formValues[$field . '_low']) {
+              $this->_formValues[$field . '_low'] = date('Y-m-d H:i:s', strtotime(CRM_Utils_Date::processDate($this->_formValues[$field . '_low'])));
+            }
+          }
+          if (isset($this->_formValues[$field . '_high'])) {
+            if (date('Y-m-d H:i:s', strtotime($this->_formValues[$field . '_low'])) !== $this->_formValues[$field . '_high']) {
+              $this->_formValues[$field . '_high'] = date('Y-m-d H:i:s', strtotime(CRM_Utils_Date::processDate($this->_formValues[$field . '_high'])));
+            }
+          }
+        }
+      }
+    }
+  }
+
 }
diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php
@@ -327,9 +327,11 @@ public static function getTemplateHandlableSearchFields() {
    */
   public static function buildSearchForm(&$form) {
 
+
     $grantType = CRM_Core_OptionGroup::values('grant_type');
     $form->addSearchFieldMetadata(['Grant' => self::getSearchFieldMetadata()]);
     $form->addFormFieldsFromMetadata();
+    $form->convertFormValues();
     $form->assign('grantSearchFields', self::getTemplateHandlableSearchFields());
     $form->add('select', 'grant_type_id', ts('Grant Type'), $grantType, FALSE,
       array('id' => 'grant_type_id', 'multiple' => 'multiple', 'class' => 'crm-select2')