From 0a993c89f9c6d70de6b100a766fa2a04093dba1f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 13 Dec 2014 19:15:56 -0800
Subject: [PATCH] CRM-15578 - crmMailing2 - Fix regression in "From Address".

Also: Make convention compatible with editing multiple mailings.
---
 js/angular-crmMailing2-directives.js | 23 +++++++++++++++
 js/angular-crmMailing2.js            | 16 ++++------
 partials/crmMailing2/mailing.html    | 44 +++++++++++++++-------------
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index 63387786df..4c3abf75f7 100644
--- 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: {
diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index 85ea123dcf..0edf9ecd45 100644
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -66,14 +66,13 @@
     });
   });
 
-  crmMailing2.controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmFromAddresses, crmStatus, CrmAttachments) {
+  crmMailing2.controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, CrmAttachments) {
     $scope.mailing = selectedMail;
     $scope.attachments = new CrmAttachments(function () {
       return {entity_table: 'civicrm_mailing', entity_id: $scope.mailing.id};
     });
     $scope.attachments.load();
     $scope.crmMailingConst = CRM.crmMailing;
-    $scope.crmFromAddresses = crmFromAddresses;
 
     $scope.partialUrl = partialUrl;
     var ts = $scope.ts = CRM.ts('CiviMail');
@@ -124,15 +123,6 @@
         // FIXME: Angular unnecessarily refreshes UI
       }
     });
-
-    $scope.fromPlaceholder = {
-      label: crmFromAddresses.getByAuthorEmail($scope.mailing.from_name, $scope.mailing.from_email, true).label
-    };
-    $scope.$watch('fromPlaceholder.label', function (newValue) {
-      var addr = crmFromAddresses.getByLabel(newValue);
-      $scope.mailing.from_name = addr.author;
-      $scope.mailing.from_email = addr.email;
-    });
   });
 
   // Controller for the edit-recipients fields (
@@ -451,6 +441,10 @@
     setTimeout(scopeApply(init), 0);
   });
 
+  crmMailing2.controller('EmailAddrCtrl', function EmailAddrCtrl($scope, crmFromAddresses){
+    $scope.crmFromAddresses = crmFromAddresses;
+  });
+
   // Controller for schedule-editing widget.
   // Scope members:
   //  - [input] mailing: object
diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html
index 1492f3b1d0..62b4b524ad 100644
--- a/partials/crmMailing2/mailing.html
+++ b/partials/crmMailing2/mailing.html
@@ -20,28 +20,32 @@ Required vars: mailing, crmMailingConst
       </div>
     </div>
     <div crm-ui-field="subform.fromAddress" crm-title="ts('From')">
-      <select
-        crm-ui-id="subform.fromAddress"
-        name="fromAddress"
-        ui-jq="select2"
-        ui-options="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
-        ng-model="fromPlaceholder.label"
-        ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
-        required>
-        <option value=""></option>
-      </select>
+      <div ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="mailing">
+        <select
+          crm-ui-id="subform.fromAddress"
+          name="fromAddress"
+          ui-jq="select2"
+          ui-options="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
+          ng-model="fromPlaceholder.label"
+          ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
+          required>
+          <option value=""></option>
+        </select>
+      </div>
     </div>
     <div crm-ui-field="subform.replyTo" crm-title="ts('Reply-To')" ng-show="crmMailingConst.enableReplyTo">
-      <select
-        crm-ui-id="subform.replyTo"
-        name="replyTo"
-        ui-jq="select2"
-        ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
-        ng-model="mailing.replyto_email"
-        ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
-        >
-        <option value=""></option>
-      </select>
+      <div ng-controller="EmailAddrCtrl">
+        <select
+          crm-ui-id="subform.replyTo"
+          name="replyTo"
+          ui-jq="select2"
+          ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
+          ng-model="mailing.replyto_email"
+          ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
+          >
+          <option value=""></option>
+        </select>
+      </div>
     </div>
     <div crm-ui-field="subform.recipients" crm-title="ts('Recipients')">
       <div ng-controller="EditRecipCtrl">
-- 
2.25.1