From 08baf3ec04a24b6718a9931918371075155eb742 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 13 Feb 2015 17:09:06 -0800 Subject: [PATCH] CRM-15361, CRM-15857 - crmMailing - Expose email_selection_method in UI --- js/angular-crmMailing.js | 10 ++++-- .../crmMailing/dialog/recipientOptions.html | 36 +++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js index 5623e42fa9..3ce5edbb53 100644 --- a/js/angular-crmMailing.js +++ b/js/angular-crmMailing.js @@ -169,7 +169,7 @@ // Scope members: // - [input] mailing: object // - [output] recipients: array of recipient records - angular.module('crmMailing').controller('EditRecipCtrl', function EditRecipCtrl($scope, dialogService, crmApi, crmMailingMgr) { + angular.module('crmMailing').controller('EditRecipCtrl', function EditRecipCtrl($scope, dialogService, crmApi, crmMailingMgr, $q, crmMetadata) { var ts = $scope.ts = CRM.ts(null); $scope.recipients = null; $scope.getRecipientsEstimate = function () { @@ -267,7 +267,13 @@ modal: true, title: ts('Edit Options') }; - dialogService.open('previewComponentDialog', '~/crmMailing/dialog/recipientOptions.html', mailing, options); + $q.when(crmMetadata.getFields('Mailing')).then(function(fields) { + var model = { + fields: fields, + mailing: mailing + }; + dialogService.open('previewComponentDialog', '~/crmMailing/dialog/recipientOptions.html', model, options); + }); }; }); diff --git a/partials/crmMailing/dialog/recipientOptions.html b/partials/crmMailing/dialog/recipientOptions.html index ad898f3c2e..4454dd2f98 100644 --- a/partials/crmMailing/dialog/recipientOptions.html +++ b/partials/crmMailing/dialog/recipientOptions.html @@ -1,11 +1,12 @@ -
-
+
+
+
@@ -15,6 +16,35 @@

{{ts('To send only one message to the shared address, enable this option. Mail-merge tokens will be filled for only one person.')}}

{{ts('To send separate messages for each person, disable this option. Mail-merge tokens will be filled separately for each person.')}}

+ +
+ +
+ +
+ +
+
-- 2.25.1