Fix broken case activity date filter

diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php
index 7eb4efc3f883c89bfda666d188a4a923408af5bb..787c18d26d14d0e6a8f53fceb606833a35b44ea1 100644 (file)
--- a/CRM/Activity/Page/AJAX.php
+++ b/CRM/Activity/Page/AJAX.php
@@ -48,8 +48,9 @@ class CRM_Activity_Page_AJAX {
       'status_id' => 'Integer',
       'activity_deleted' => 'Boolean',
       'activity_type_id' => 'Integer',
-      'activity_date_low' => 'Date',
-      'activity_date_high' => 'Date',
+      // "Date" validation fails because it expects only numbers with no hyphens
+      'activity_date_low' => 'Alphanumeric',
+      'activity_date_high' => 'Alphanumeric',
     );
 
     $params = CRM_Core_Page_AJAX::defaultSortAndPagerParams();

diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php
index 9178c3ff81eeee3a3dfb884df690fe3e212d1283..642aeaa059fa38a88c8757217147091e8cdc8d9b 100644 (file)
--- a/CRM/Case/Form/CaseView.php
+++ b/CRM/Case/Form/CaseView.php
@@ -483,9 +483,9 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form {
     $activityStatus = CRM_Core_PseudoConstant::activityStatus();
     $form->add('select', 'status_id', ts('Status'), array("" => ts(' - any status - ')) + $activityStatus, FALSE, array('id' => 'status_id_' . $form->_caseID));
 
-    // activity dates
-    $form->addDate('activity_date_low_' . $form->_caseID, ts('Activity Dates - From'), FALSE, array('formatType' => 'searchDate'));
-    $form->addDate('activity_date_high_' . $form->_caseID, ts('To'), FALSE, array('formatType' => 'searchDate'));
+    // activity date search filters
+    $form->add('datepicker', 'activity_date_low_' . $form->_caseID, ts('Activity Dates - From'), [], FALSE, ['time' => FALSE]);
+    $form->add('datepicker', 'activity_date_high_' . $form->_caseID, ts('To'), [], FALSE, ['time' => FALSE]);
 
     if (CRM_Core_Permission::check('administer CiviCRM')) {
       $form->add('checkbox', 'activity_deleted', ts('Deleted Activities'), '', FALSE, array('id' => 'activity_deleted_' . $form->_caseID));

diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl
index ca89cf07ec53f5adb0071061e8cbb5afde12967d..781d2da4c4b775af20a4f3f0d4aaffc944d7bdda 100644 (file)
--- a/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/templates/CRM/Case/Form/ActivityTab.tpl
@@ -50,12 +50,12 @@
             <td class="crm-case-caseview-form-block-activity_date_low">
               {assign var=activitylow  value=activity_date_low_$caseID}
               {$form.$activitylow.label}<br />
-              {include file="CRM/common/jcalendar.tpl" elementName=$activitylow}
+              {$form.$activitylow.html}
             </td>
             <td class="crm-case-caseview-form-block-activity_date_high">
               {assign var=activityhigh  value=activity_date_high_$caseID}
               {$form.$activityhigh.label}<br />
-              {include file="CRM/common/jcalendar.tpl" elementName=$activityhigh}
+              {$form.$activityhigh.html}
             </td>
             <td class="crm-case-caseview-form-block-activity_type_filter_id">
               {$form.activity_type_filter_id.label}<br />