CRM-15578 - crmMailing2 - Fix regression in "From Address".

[civicrm-core.git] / js / angular-crmMailing2-directives.js

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index 63387786df5a5bf78ca7aa1bf499a44142b0bef9..4c3abf75f75889a4b5c547759bab1f505efb50ab 100644 (file)
--- a/js/angular-crmMailing2-directives.js
+++ b/js/angular-crmMailing2-directives.js
@@ -37,6 +37,29 @@
     });
   });
 
+  // Convert between a mailing "From Address" (mailing.from_name,mailing.from_email) and a unified label ("Name" <e@ma.il>)
+  // example: <span crm-mailing-from-address="myPlaceholder" crm-mailing="myMailing"><select ng-model="myPlaceholder.label"></select></span>
+  // NOTE: This really doesn't belong in a directive. I've tried (and failed) to make this work with a getterSetter binding, eg
+  // <select ng-model="mailing.convertFromAddress" ng-model-options="{getterSetter: true}">
+  crmMailing2.directive('crmMailingFromAddress', function ($parse, crmFromAddresses) {
+    return {
+      link: function (scope, element, attrs) {
+        var placeholder = attrs.crmMailingFromAddress;
+        var model = $parse(attrs.crmMailing);
+        var mailing = model(scope.$parent);
+        scope[placeholder] = {
+          label: crmFromAddresses.getByAuthorEmail(mailing.from_name, mailing.from_email, true).label
+        };
+        scope.$watch(placeholder + '.label', function (newValue) {
+          var addr = crmFromAddresses.getByLabel(newValue);
+          mailing.from_name = addr.author;
+          mailing.from_email = addr.email;
+        });
+        // FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?
+      }
+    };
+  });
+
   crmMailing2.directive('crmMailingReviewBool', function () {
     return {
       scope: {