From 753f3087edccdf914496980e9ec1c4347d5e6ff2 Mon Sep 17 00:00:00 2001
From: Deepak Srivastava <deepak.srivastava@webaccess.co.in>
Date: Fri, 20 Sep 2013 14:11:58 +0530
Subject: [PATCH] CRM-13382 - fixes based on brian's feedback - allow draft &
 other status combination, archive & cancel ambiguity fix, default elements
 for archive screen.

---
 CRM/Mailing/Form/Search.php           |  1 -
 CRM/Mailing/Selector/Browse.php       | 16 +++++-----
 templates/CRM/Mailing/Form/Search.tpl | 29 ++++--------------
 templates/CRM/Mailing/Page/Browse.tpl | 44 +++++++++------------------
 4 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/CRM/Mailing/Form/Search.php b/CRM/Mailing/Form/Search.php
index ade608c01a..fa27eb8d4b 100644
--- a/CRM/Mailing/Form/Search.php
+++ b/CRM/Mailing/Form/Search.php
@@ -87,7 +87,6 @@ class CRM_Mailing_Form_Search extends CRM_Core_Form {
       $defaults['is_archived'] = 0;
     }
     if ($parent->get('archived')) {
-      $statusVals = array('Scheduled', 'Complete', 'Running', 'Canceled');
       $defaults['is_archived'] = 1;
     }
     foreach ($statusVals as $status) {
diff --git a/CRM/Mailing/Selector/Browse.php b/CRM/Mailing/Selector/Browse.php
index 89ab00e913..91a85409c5 100644
--- a/CRM/Mailing/Selector/Browse.php
+++ b/CRM/Mailing/Selector/Browse.php
@@ -508,22 +508,20 @@ LEFT JOIN  civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul
       $isDraft = 1;
     }
 
+    $statusClauses = array();
     if ($isDraft) {
-      $clauses[] = "civicrm_mailing_job.status IS NULL";
-      $clauses[] = "civicrm_mailing.scheduled_id IS NULL";
+      $statusClauses[] = "civicrm_mailing.scheduled_id IS NULL";
     }
-
-    // CRM-4290, do not show archived or unscheduled mails
-    // on 'Scheduled and Sent Mailing' page selector
     if (!empty($mailingStatus)) {
-      $clauses[] = "civicrm_mailing.scheduled_id IS NOT NULL";
-      $clauses[] = "civicrm_mailing_job.status IN ('" . implode("', '", array_keys($mailingStatus)) . "')";
+      $statusClauses[] = "civicrm_mailing_job.status IN ('" . implode("', '", array_keys($mailingStatus)) . "')";
+    }
+    if (!empty($statusClauses)) {
+      $clauses[] = "(" . implode(' OR ', $statusClauses) . ")";
     }
 
     if (isset($isArchived)) {
       if ($isArchived) {
-        // CRM-6446: archived view should also show cancelled mailings
-        $clauses[] = "(civicrm_mailing.is_archived = 1 OR civicrm_mailing_job.status = 'Canceled')";
+        $clauses[] = "civicrm_mailing.is_archived = 1";
       } else {
         $clauses[] = "(civicrm_mailing.is_archived IS NULL OR civicrm_mailing.is_archived = 0)";
       }
diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl
index c5ad9ae736..e3fa925e62 100644
--- a/templates/CRM/Mailing/Form/Search.tpl
+++ b/templates/CRM/Mailing/Form/Search.tpl
@@ -77,42 +77,25 @@
 {literal}
 <script type="text/javascript">
   cj(document).ready( function( ) {
-    var statusBoxes = cj(":checkbox[name^='mailing_status[']");
     var archiveOption = cj("input[name^='is_archived']:radio");
-    statusBoxes.each(function() {
-      cj(this).change(function() {
-        if (cj(":checkbox[name^='mailing_status[']:checked").length > 0) {
-          disableDraft();
-        } else if (cj("input[name^='is_archived']:radio:checked").length <= 0) {
-          cj('#status_unscheduled').attr('readonly',false);
-        }
-      }).trigger('change');
-    });
     cj('#status_unscheduled').change(function() {
       if (cj(this).prop('checked') ) {
-        statusBoxes.each(function() {
-          cj(this).attr('checked',false);
-          cj(this).attr('readonly',true);
-          archiveOption.attr('checked',false);
-          archiveOption.attr('readonly',true);
-        });
+        archiveOption.attr('checked',false);
+        archiveOption.attr('readonly',true);
       } else {
-        statusBoxes.each(function() {
-          cj(this).attr('readonly',false);
-          archiveOption.attr('readonly',false);
-        });
+        archiveOption.attr('readonly',false);
       }
     }).trigger('change');
     archiveOption.change(function() {
       if (cj("input[name^='is_archived']:radio:checked").length) {
         disableDraft();
+      } else {
+        cj('#status_unscheduled').attr('readonly',false); 
       }
     }).trigger('change');
     cj(".crm-search-form-block-is_archive .crm-clear-link a").click(function() {
       archiveOption.attr('checked',false);
-      if (cj(":checkbox[name^='mailing_status[']:checked").length <= 0) { 
-        cj('#status_unscheduled').attr('readonly',false); 
-      }
+      cj('#status_unscheduled').attr('readonly',false); 
     });
   });
 
diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl
index 9eb2f30902..f474b6841d 100644
--- a/templates/CRM/Mailing/Page/Browse.tpl
+++ b/templates/CRM/Mailing/Page/Browse.tpl
@@ -50,27 +50,14 @@
     <table class="selector">
       <thead class="sticky">
       {foreach from=$columnHeaders item=header}
-        {if $unscheduled} {* Hide columnns not relevant for unscheduled mailings. *}
-            {if $header.sort NEQ 'scheduled_by' && $header.sort NEQ 'scheduled_date' && $header.sort NEQ 'start_date' & $header.sort NEQ 'end_date'}
-            <th>
-              {if $header.sort}
-                {assign var='key' value=$header.sort}
-                {$sort->_response.$key.link}
-              {else}
-                {$header.name}
-              {/if}
-            </th>
-            {/if}
-        {elseif $header.sort NEQ 'created_date'}
-            <th>
-              {if $header.sort}
-                {assign var='key' value=$header.sort}
-                {$sort->_response.$key.link}
-              {else}
-                {$header.name}
-              {/if}
-            </th>
-        {/if}
+        <th>
+          {if $header.sort}
+            {assign var='key' value=$header.sort}
+            {$sort->_response.$key.link}
+          {else}
+            {$header.name}
+          {/if}
+        </th>
       {/foreach}
       </thead>
 
@@ -80,15 +67,12 @@
         <td class="crm-mailing-name">{$row.name}</td>
         <td class="crm-mailing-status crm-mailing_status-{$row.status}">{$row.status}</td>
         <td class="crm-mailing-created_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.created_id}>{$row.created_by}</a></td>
-        {if $unscheduled}
-            <td class="crm-mailing-created_date">{$row.created_date}</td>
-        {else}
-            <td class="crm-mailing-scheduled_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.scheduled_id}>{$row.scheduled_by}</a></td>
-            <td class="crm-mailing-scheduled">{$row.scheduled}</td>
-            <td class="crm-mailing-start">{$row.start}</td>
-            <td class="crm-mailing-end">{$row.end}</td>
-        {/if}
-      {if call_user_func(array('CRM_Campaign_BAO_Campaign','isCampaignEnable'))}
+        <td class="crm-mailing-created_date">{$row.created_date}</td>
+        <td class="crm-mailing-scheduled_by"><a href ={crmURL p='civicrm/contact/view' q="reset=1&cid="}{$row.scheduled_id}>{$row.scheduled_by}</a></td>
+        <td class="crm-mailing-scheduled">{$row.scheduled}</td>
+        <td class="crm-mailing-start">{$row.start}</td>
+        <td class="crm-mailing-end">{$row.end}</td>
+       {if call_user_func(array('CRM_Campaign_BAO_Campaign','isCampaignEnable'))}
           <td class="crm-mailing-campaign">{$row.campaign}</td>
       {/if}
         <td>{$row.action|replace:'xx':$row.id}</td>
-- 
2.25.1