From 495f197a6d494a2e36bc42983c53d6cfdf363388 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Feb 2015 14:07:06 -0800
Subject: [PATCH] CRM-15856 - crmMailingAB - "Reply-To" and "Track Replies" are
 mutually exclusive

---
 js/angular-crmMailingAB.js               |  2 ++
 partials/crmMailingAB/joint-mailing.html | 33 +++++++++++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 657c8c2362..1c8e833859 100644
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -105,6 +105,8 @@
               'subject',
               'from_name',
               'from_email',
+              'replyto_email',
+              'override_verp', // keep override_verp and replyto_Email linked
               'body_html',
               'body_text'
             ]);
diff --git a/partials/crmMailingAB/joint-mailing.html b/partials/crmMailingAB/joint-mailing.html
index e0585bea62..1537025efb 100644
--- a/partials/crmMailingAB/joint-mailing.html
+++ b/partials/crmMailingAB/joint-mailing.html
@@ -66,13 +66,12 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.a">
         <select
           crm-ui-id="subform.fromAddress"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
           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>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
@@ -80,13 +79,12 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.a">
         <select
           crm-ui-id="subform.fromAddressA"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
           name="fromAddressA"
-          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>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
@@ -94,13 +92,12 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.b">
         <select
           crm-ui-id="subform.fromAddressB"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
           name="fromAddressB"
-          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>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
@@ -110,13 +107,13 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl">
         <select
           crm-ui-id="subform.replyTo"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
           name="replyTo"
-          ui-jq="select2"
-          ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
+          ng-change="checkReplyToChange(abtest.mailings.a)"
           ng-model="abtest.mailings.a.replyto_email"
-          ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
           >
           <option value=""></option>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
@@ -124,13 +121,13 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl">
         <select
           crm-ui-id="subform.replyToA"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
           name="replyToA"
-          ui-jq="select2"
-          ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
+          ng-change="checkReplyToChange(abtest.mailings.a)"
           ng-model="abtest.mailings.a.replyto_email"
-          ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
           >
           <option value=""></option>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
@@ -138,13 +135,13 @@ processed by Angular; if false, the field will be hidden and completely ignored
       <span ng-controller="EmailAddrCtrl">
         <select
           crm-ui-id="subform.replyToB"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
           name="replyToB"
-          ui-jq="select2"
-          ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
+          ng-change="checkReplyToChange(abtest.mailings.b)"
           ng-model="abtest.mailings.b.replyto_email"
-          ng-options="frm.label as frm.label for frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'"
           >
           <option value=""></option>
+          <option ng-repeat="frm in crmFromAddresses.getAll() | filter:{is_active:1} | orderBy:'weight'" value="{{frm.label}}">{{frm.label}}</option>
         </select>
       </span>
     </div>
-- 
2.25.1