From c1164049760f874b4062839eec7a42f36dd4dcd8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 27 Apr 2019 19:34:20 +1200
Subject: [PATCH] Remove last free jcalendar
This is the last jcalendar outside of buildDateRange instances.
It turns out to be 'just a form' and pretty straight forward
---
CRM/Campaign/Form/Search/Campaign.php | 16 +++++++++++-----
templates/CRM/Campaign/Form/Search/Campaign.tpl | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/CRM/Campaign/Form/Search/Campaign.php b/CRM/Campaign/Form/Search/Campaign.php
index 6fc5d63ab84..f292272399c 100644
--- a/CRM/Campaign/Form/Search/Campaign.php
+++ b/CRM/Campaign/Form/Search/Campaign.php
@@ -36,6 +36,15 @@
*/
class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
+ /**
+ * Explicitly declare the entity api name.
+ *
+ * @return string
+ */
+ public function getDefaultEntity() {
+ return 'Campaign';
+ }
+
/**
* Are we forced to run a search.
*
@@ -78,11 +87,8 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
//campaign description.
$this->add('text', 'description', ts('Description'), $attributes['description']);
- //campaign start date.
- $this->addDate('start_date', ts('From'), FALSE, ['formatType' => 'searchDate']);
-
- //campaign end date.
- $this->addDate('end_date', ts('To'), FALSE, ['formatType' => 'searchDate']);
+ $this->add('datepicker', 'start_date', ts('Campaign Start Date'), [], FALSE, ['time' => FALSE]);
+ $this->add('datepicker', 'end_date', ts('Campaign End Date'), [], FALSE, ['time' => FALSE]);
//campaign type.
$campaignTypes = CRM_Campaign_PseudoConstant::campaignType();
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 7a88582f299..d16b9687149 100644
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -99,10 +99,10 @@
<tr>
<td>{$form.start_date.label}<br/>
- {include file="CRM/common/jcalendar.tpl" elementName=start_date}
+ {$form.start_date.html}
</td>
<td>{$form.end_date.label}<br/>
- {include file="CRM/common/jcalendar.tpl" elementName=end_date}
+ {$form.end_date.html}
</td>
</tr>
--
GitLab