projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0b77ccc)
CRM-17869 - Support all entities with custom date search
authorColeman Watts <coleman@civicrm.org>
Sat, 22 Oct 2016 01:37:56 +0000 (21:37 -0400)
committerColeman Watts <coleman@civicrm.org>
Sat, 22 Oct 2016 01:37:56 +0000 (21:37 -0400)
CRM/Activity/BAO/Query.php patch | blob | blame | history
CRM/Case/BAO/Query.php patch | blob | blame | history
CRM/Contact/Form/Search/Criteria.php patch | blob | blame | history
CRM/Contribute/BAO/ContributionRecur.php patch | blob | blame | history
CRM/Contribute/BAO/Query.php patch | blob | blame | history
CRM/Event/BAO/Query.php patch | blob | blame | history
CRM/Grant/BAO/Query.php patch | blob | blame | history
CRM/Member/BAO/Query.php patch | blob | blame | history
CRM/Pledge/BAO/Query.php patch | blob | blame | history

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 370c16dd703085e2d80a5912bc822ec09b9cf859..b42e610c3e1c5498253d76c846b2215451c3805b 100644 (file)
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -465,7 +465,12 @@ class CRM_Activity_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php
index 4a27d40c03fe5789cde0cce9fc99cf989b05f398..d4e7a8bf0901d0dad3c06bb345484e11abb8338b 100644 (file)
--- a/CRM/Case/BAO/Query.php
+++ b/CRM/Case/BAO/Query.php
@@ -677,8 +677,6 @@ case_relation_type.id = case_relationship.relationship_type_id )";
    * @param CRM_Core_Form $form
    */
   public static function buildSearchForm(&$form) {
-    $config = CRM_Core_Config::singleton();
-
     //validate case configuration.
     $configured = CRM_Case_BAO_Case::isCaseConfigured();
     $form->assign('notConfigured', !$configured['configured']);
@@ -727,7 +725,12 @@ case_relation_type.id = case_relationship.relationship_type_id )";
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 639814e63abc9dbf15c9ad7fa72d01bd483bd6d2..853579ac487440c33062abd70b4195a8de15852f 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -379,7 +379,12 @@ class CRM_Contact_Form_Search_Criteria {
       foreach ($groupDetails as $group) {
         foreach ($group['fields'] as $field) {
           $elementName = 'custom_' . $field['id'];
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $field['id'], FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $field['id'], FALSE, TRUE);
+          }
         }
       }
     }
@@ -455,7 +460,12 @@ class CRM_Contact_Form_Search_Criteria {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
index ea40fa3d7423845710a185d3443d7e0a397069e8..cb9a00bbe714dcadc019bd4831b51ea30fa0c0f5 100644 (file)
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -791,7 +791,12 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php
index 60769cedc87026d332cfd1cac586023b6140f27a..7b2779cce8dd82291c43b4232a1c0d3c5c9fe97b 100644 (file)
--- a/CRM/Contribute/BAO/Query.php
+++ b/CRM/Contribute/BAO/Query.php
@@ -1121,7 +1121,12 @@ class CRM_Contribute_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php
index 7bce9747f77b467a6ab68eaa67162abd781c0d48..a0c96f329e67561facb31e2318b312f2966115e9 100644 (file)
--- a/CRM/Event/BAO/Query.php
+++ b/CRM/Event/BAO/Query.php
@@ -655,7 +655,12 @@ class CRM_Event_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php
index b03b65c25d8958304c8401a5b486f09272d82f19..10222a9339a95e1f806ccc5a530bcf06d3076753 100644 (file)
--- a/CRM/Grant/BAO/Query.php
+++ b/CRM/Grant/BAO/Query.php
@@ -363,7 +363,12 @@ class CRM_Grant_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 6a7ebb5cd119851a23db41e0a6074fb7d900f883..c0f24dd2996dbae015468da7c05a5990c3fa3ad1 100644 (file)
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -514,7 +514,12 @@ class CRM_Member_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }
diff --git a/CRM/Pledge/BAO/Query.php b/CRM/Pledge/BAO/Query.php
index f2aec40dfd0251f010f34f1d7c6b0970651fc46f..024a3f01c0a5bc1bda48c767c2eed8e6e969edbe 100644 (file)
--- a/CRM/Pledge/BAO/Query.php
+++ b/CRM/Pledge/BAO/Query.php
@@ -586,7 +586,12 @@ class CRM_Pledge_BAO_Query {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
+            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          }
+          else {
+            CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
+          }
         }
       }
     }