CRM-15578 - crmMailing2 - Add recipients to "mailing.html"

diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index d1a1af837011702fbcd71ffc2cbce17c66dcb79a..d75cfe308e2086a171eef095c945db74eb90df1e 100644 (file)
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -16,6 +16,8 @@
       from: _.where(CRM.crmMailing.fromAddress, {is_default: "1"})[0].label,
       replyto_email: "",
       subject: "",
+      groups: {include: [], exclude: [4]}, // fixme
+      mailings: {include: [], exclude: []},
       body_html: "",
       body_text: "",
       visibility: "Public Pages",

diff --git a/partials/crmMailing2/field/recipients.html b/partials/crmMailing2/field/recipients.html
new file mode 100644 (file)
index 0000000..7837424
--- /dev/null
+++ b/partials/crmMailing2/field/recipients.html
@@ -0,0 +1,12 @@
+<!--
+Controller: EditMailingCtrl
+Required vars: mailing, crmMailingConst
+-->
+<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"
+        required
+        multiple>
+</select>

diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html
index 978fd132c55566165eb74059f77748953779d90b..6f38677e9dcff921581ee6cb8e6539f2c1403282 100644 (file)
--- a/partials/crmMailing2/mailing.html
+++ b/partials/crmMailing2/mailing.html
@@ -37,6 +37,13 @@ FIXME: Don't hardcode table-based layout!
         </select>
       </td>
     </tr>
+    <tr>
+      <td class="label">
+        <label crm-ui-label crm-for="recipients">{{ts('Recipients')}}</label>
+      </td>
+      <td ng-include="partialUrl('field/recipients.html')">
+      </td>
+    </tr>
     <tr>
       <td class="label">
         <label crm-ui-label crm-for="subject">{{ts('Subject')}}</label>