From 62d2e387136073928ccbdb14e37b6bafbfac3da2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 15 Dec 2014 17:03:45 -0800
Subject: [PATCH] CRM-15578 - crmMailingAB2 - Fix recipients field. DRY.

---
 js/angular-crmMailing2-directives.js      |  2 ++
 partials/crmMailing2/mailing.html         | 23 +----------------
 partials/crmMailing2/recipients.html      | 28 +++++++++++++++++++++
 partials/crmMailingAB2/joint-mailing.html | 28 ---------------------
 partials/crmMailingAB2/setup.html         | 30 +----------------------
 5 files changed, 32 insertions(+), 79 deletions(-)
 create mode 100644 partials/crmMailing2/recipients.html

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index 4f79ab75a8..3f47dda6dd 100644
--- a/js/angular-crmMailing2-directives.js
+++ b/js/angular-crmMailing2-directives.js
@@ -13,6 +13,7 @@
     crmMailingBlockPreview: partialUrl('preview.html'),
     crmMailingBlockPublication: partialUrl('publication.html'),
     crmMailingBlockResponses: partialUrl('responses.html'),
+    crmMailingBlockRecipients: partialUrl('recipients.html'),
     crmMailingBlockReview: partialUrl('review.html'),
     crmMailingBlockSchedule: partialUrl('schedule.html'),
     crmMailingBlockSummary: partialUrl('summary.html'),
@@ -32,6 +33,7 @@
           scope.mailing = model(scope.$parent);
           scope.crmMailingConst = CRM.crmMailing;
           scope.ts = CRM.ts('CiviMail');
+          scope[directiveName] = attr[directiveName] ? scope.$parent.$eval(attr[directiveName]) : {};
         }
       };
     });
diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html
index ed33ec2d11..40ac00f56d 100644
--- a/partials/crmMailing2/mailing.html
+++ b/partials/crmMailing2/mailing.html
@@ -50,28 +50,7 @@ It could perhaps be thinned by 30-60% by making more directives.
       </div>
     </div>
     <div crm-ui-field="subform.recipients" crm-title="ts('Recipients')">
-      <div ng-controller="EditRecipCtrl">
-        <div style="float: right;">
-          <div class='crmMailing2-recip-est'>
-            <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
-          </div>
-          <div>
-            <input name='dedupe_email' type='checkbox' ng-model='mailing.dedupe_email'  ng-true-value="1" ng-false-value="0" id="recipients-dedupe-email" />
-            <label for="recipients-dedupe-email">
-              {{ts('Dedupe')}}
-            </label>
-          </div>
-        </div>
-        <select crm-mailing-recipients
-                crm-mailing="mailing"
-                crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
-                crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
-                name="recipients"
-                crm-ui-id="subform.recipients"
-                required
-                multiple>
-        </select>
-      </div>
+      <div crm-mailing-block-recipients="{name: 'recipients', id: 'subform.recipients'}" crm-mailing="mailing"></div>
     </div>
     <div crm-ui-field="subform.subject" crm-title="ts('Subject')">
       <div style="float: right;">
diff --git a/partials/crmMailing2/recipients.html b/partials/crmMailing2/recipients.html
new file mode 100644
index 0000000000..370f3d7aa0
--- /dev/null
+++ b/partials/crmMailing2/recipients.html
@@ -0,0 +1,28 @@
+<div ng-controller="EditRecipCtrl">
+  <div style="float: right;">
+    <div class='crmMailing2-recip-est'>
+      <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
+    </div>
+    <div>
+      <input
+        type='checkbox'
+        ng-model='mailing.dedupe_email'
+        ng-true-value="1"
+        ng-false-value="0"
+        id="recipients-dedupe-email"/>
+      <label for="recipients-dedupe-email">
+        {{ts('Dedupe')}}
+      </label>
+    </div>
+  </div>
+  <select
+    crm-mailing-recipients
+    crm-mailing="mailing"
+    crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
+    crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
+    crm-ui-id="{{crmMailingBlockRecipients.id}}"
+    name="{{crmMailingBlockRecipients.name}}"
+    required
+    multiple>
+  </select>
+</div>
diff --git a/partials/crmMailingAB2/joint-mailing.html b/partials/crmMailingAB2/joint-mailing.html
index 4a2a640c91..90cb2428f5 100644
--- a/partials/crmMailingAB2/joint-mailing.html
+++ b/partials/crmMailingAB2/joint-mailing.html
@@ -150,34 +150,6 @@ processed by Angular; if false, the field will be hidden and completely ignored
     </div>
 
 
-    <!--
-    <div crm-ui-field="subform.recipients" crm-title="ts('Recipients')">
-      <div ng-controller="EditRecipCtrl">
-        <div style="float: right;">
-          <div class='crmMailing2-recip-est'>
-            <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
-          </div>
-          <div>
-            <input name='dedupe_email' type='checkbox' ng-model='abtest.mailings.a.dedupe_email'  ng-true-value="1" ng-false-value="0" id="recipients-dedupe-email" />
-            <label for="recipients-dedupe-email">
-              {{ts('Dedupe')}}
-            </label>
-          </div>
-        </div>
-        <select crm-mailing-recipients
-                crm-mailing="mailing"
-                crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
-                crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
-                name="recipients"
-                crm-ui-id="subform.recipients"
-                required
-                multiple>
-        </select>
-      </div>
-    </div>
-    -->
-
-
     <div crm-ui-field="subform.subject" crm-title="ts('Subject')" ng-if="fields.subject">
       <div style="float: right;">
         <input crm-mailing-token crm-for="subform.subject" />
diff --git a/partials/crmMailingAB2/setup.html b/partials/crmMailingAB2/setup.html
index cac3b68897..89150f3975 100644
--- a/partials/crmMailingAB2/setup.html
+++ b/partials/crmMailingAB2/setup.html
@@ -36,35 +36,7 @@
       </div>
     </div>
     <div crm-ui-field="setupForm.recipients" crm-title="ts('Recipients')" ng-if="fields.recipients">
-      <div ng-controller="EditRecipCtrl">
-        <div style="float: right;">
-          <div class='crmMailing2-recip-est'>
-            <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
-          </div>
-          <div>
-            <input
-              name='dedupe_email'
-              type='checkbox'
-              ng-model='abtest.mailings.a.dedupe_email'
-              ng-true-value="1"
-              ng-false-value="0"
-              id="recipients-dedupe-email"/>
-            <label for="recipients-dedupe-email">
-              {{ts('Dedupe')}}
-            </label>
-          </div>
-        </div>
-        <select
-          crm-mailing-recipients
-          crm-mailing="abtest.mailings.a"
-          crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
-          crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
-          name="recipients"
-          crm-ui-id="setupForm.recipients"
-          required
-          multiple>
-        </select>
-      </div>
+      <div crm-mailing-block-recipients="{name: 'recipients', id: 'setupForm.recipients'}" crm-mailing="abtest.mailings.a"></div>
     </div>
     <div crm-ui-field crm-title="ts('Distribution')" ng-if="fields.group_percentage">
       <div crm-mailing-ab-slider ng-model="abtest.ab.group_percentage"></div>
-- 
2.25.1