From 7f6e5735befa1c9db67e98c96d057cc53ea4b17c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 15 Mar 2019 15:29:12 +1300
Subject: [PATCH] --amend

Change-Id: Icea6f894d7a9e4656beae3cdb4cb5e44842b59b2
---
 CRM/Activity/Form/ActivityFilter.php         |  2 +-
 templates/CRM/Activity/Selector/Selector.tpl | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Activity/Form/ActivityFilter.php b/CRM/Activity/Form/ActivityFilter.php
index 46ff5fcfbf..ba3c66f340 100644
--- a/CRM/Activity/Form/ActivityFilter.php
+++ b/CRM/Activity/Form/ActivityFilter.php
@@ -43,7 +43,7 @@ class CRM_Activity_Form_ActivityFilter extends CRM_Core_Form {
     $this->add('select', 'activity_type_filter_id', ts('Include'), array('' => ts('- all activity type(s) -')) + $activityOptions);
     $this->add('select', 'activity_type_exclude_filter_id', ts('Exclude'), array('' => ts('- select activity type -')) + $activityOptions);
     CRM_Core_Form_Date::buildDateRange(
-      $this, 'activity_date', 1,
+      $this, 'activity_date_time', 1,
       '_low', '_high', ts('From:'),
       FALSE, array(), 'searchDate',
       FALSE, array('class' => 'crm-select2 medium')
diff --git a/templates/CRM/Activity/Selector/Selector.tpl b/templates/CRM/Activity/Selector/Selector.tpl
index 03dd2fc38a..fc44167a68 100644
--- a/templates/CRM/Activity/Selector/Selector.tpl
+++ b/templates/CRM/Activity/Selector/Selector.tpl
@@ -37,7 +37,7 @@
           <td class="crm-contact-form-block-activity_type_exclude_filter_id crm-inline-edit-field">
             {$form.activity_type_exclude_filter_id.label}<br /> {$form.activity_type_exclude_filter_id.html|crmAddClass:medium}
           </td>
-          {include file="CRM/Core/DateRange.tpl" fieldName="activity_date" from='_low' to='_high' label='<label>Date</label>'}
+          {include file="CRM/Core/DateRange.tpl" fieldName="activity_date_time" from='_low' to='_high' label='<label>Date</label>'}
           <td class="crm-contact-form-block-activity_status_filter_id crm-inline-edit-field">
             <label>{ts}Status{/ts}</label><br /> {$form.status_id.html|crmAddClass:medium}
           </td>
@@ -53,7 +53,7 @@
       <th data-data="source_contact_name" class="crm-contact-activity-source_contact">{ts}Added By{/ts}</th>
       <th data-data="target_contact_name" data-orderable="false" class="crm-contact-activity-target_contact">{ts}With{/ts}</th>
       <th data-data="assignee_contact_name" data-orderable="false" class="crm-contact-activity-assignee_contact">{ts}Assigned{/ts}</th>
-      <th data-data="activity_date_time" class="crm-contact-activity-activity_date">{ts}Date{/ts}</th>
+      <th data-data="activity_date_time" class="crm-contact-activity-activity_date_time">{ts}Date{/ts}</th>
       <th data-data="status_id" cell-class="crmf-status_id crm-editable" cell-data-type="select" cell-data-refresh="true" class="crm-contact-activity-activity_status">{ts}Status{/ts}</th>
       <th data-data="links" data-orderable="false" class="crm-contact-activity-links">&nbsp;</th>
     </tr>
@@ -71,9 +71,9 @@
               var status_id = $('.crm-activity-selector-' + context + ' select#status_id').val() || [];
               d.activity_type_id = $('.crm-activity-selector-' + context + ' select#activity_type_filter_id').val(),
               d.activity_type_exclude_id = $('.crm-activity-selector-' + context + ' select#activity_type_exclude_filter_id').val(),
-              d.activity_date_time_relative = $('select#activity_date_relative').val(),
-              d.activity_date_time_low = $('#activity_date_low').val(),
-              d.activity_date_time_high = $('#activity_date_high').val(),
+              d.activity_date_time_relative = $('select#activity_date_time_relative').val(),
+              d.activity_date_time_low = $('#activity_date_time_low').val(),
+              d.activity_date_time_high = $('#activity_date_time_high').val(),
               d.activity_status_id = status_id.join(',')
             }
           }
-- 
2.25.1