From 6ff6d85a6467a0babbcecf5825812302d3be0768 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Thu, 19 Sep 2013 18:06:42 +0530 Subject: [PATCH] CRM-13382 - default behavior for archive screen + jquery for invalid search combinations --- CRM/Mailing/Form/Search.php | 11 +++--- templates/CRM/Mailing/Form/Search.tpl | 52 +++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/CRM/Mailing/Form/Search.php b/CRM/Mailing/Form/Search.php index 80675b2272..ade608c01a 100644 --- a/CRM/Mailing/Form/Search.php +++ b/CRM/Mailing/Form/Search.php @@ -76,24 +76,23 @@ class CRM_Mailing_Form_Search extends CRM_Core_Form { } function setDefaultValues() { - $defaults = array(); + $defaults = $statusVals = array(); $parent = $this->controller->getParent(); if ($parent->get('unscheduled')) { $defaults['status_unscheduled'] = 1; } - if ($parent->get('scheduled')) { $statusVals = array('Scheduled', 'Complete', 'Running', 'Canceled'); - foreach ($statusVals as $status) { - $defaults['mailing_status'][$status] = 1; - } $defaults['is_archived'] = 0; } - if ($parent->get('archived')) { + $statusVals = array('Scheduled', 'Complete', 'Running', 'Canceled'); $defaults['is_archived'] = 1; } + foreach ($statusVals as $status) { + $defaults['mailing_status'][$status] = 1; + } if ($parent->_sms) { $defaults['sms'] = 1; diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl index 37997208d5..c5ad9ae736 100644 --- a/templates/CRM/Mailing/Form/Search.tpl +++ b/templates/CRM/Mailing/Form/Search.tpl @@ -42,8 +42,11 @@ {$form.sort_name.label}
{$form.sort_name.html|crmAddClass:big} {help id="id-create_sort_name"}

+
{$form.is_archived.label}
{$form.is_archived.html} + ({ts}clear{/ts}) +
{if $form.mailing_status}
@@ -70,3 +73,52 @@ + +{literal} + +{/literal} -- 2.25.1