abtesting/subject_lines.html - Use select2 for "Reply-To"

Conflicts:

	js/angular-crmMailingAB.js

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index b7cb5180d9ae03827766a66ca6144ac24de04de3..c377ad8d16ba7b073e5700ba2dccee113a9d9cf5 100755 (executable)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -579,10 +579,7 @@
 
         $(element).on("click", function () {
           if (scope.tab_val == 0) {
-
             scope.create_abtest();
-
-
           }
           else {
             if (scope.tab_val == 2) {
@@ -606,7 +603,6 @@
               scope.a_b_update();
             }
           }
-
           scope.tab_upd();
 
           var myArray1 = [];
@@ -983,7 +979,6 @@
             }
           }
 
-
           scope.$apply();
           e.preventDefault();
         })
@@ -991,7 +986,48 @@
     };
   });
 
-  crmMailingAB.directive('stopa', function () {
+  crmMailingAB.directive('replytoselect',function(){
+    return {
+      restrict : 'AE',
+      link: function(scope, element, attrs){
+          
+        function format(item){ 
+            return item.label.replace(/&/g, '&')
+            .replace(/"/g, '"')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
+        }
+          
+        CRM.api3('OptionGroup', 'get', {
+          "sequential": 1,
+          "name": "from_email_address"
+        }).done(function(result) {
+          var emailGroupId = result.id;
+          console.log(result);
+           CRM.api3('OptionValue', 'get', {
+            "sequential": 1,
+            "option_group_id": result.id
+          }).done(function(orgEmails) {
+              console.log(orgEmails);
+              
+              //$sce.trustAsHtml(
+          
+            $(element).select2({width:"200px", 
+                data: orgEmails.values,           
+                formatResult: format,
+              formatSelection: format,
+              placeholder:"Select reply to address"});
+          
+          });
+          
+        });  
+                    
+
+      }
+    };
+  });
+
+  crmMailingAB.directive('stopa',function(){
     return {
       restrict: 'AE',
       link: function (scope, element, attrs) {

diff --git a/partials/abtesting/subject_lines.html b/partials/abtesting/subject_lines.html
index 9d72d536c0dc438a63a3bf15a4aece2cad361d70..45678192a7b3c6b7081c620f7053f73cbfc93968 100755 (executable)
--- a/partials/abtesting/subject_lines.html
+++ b/partials/abtesting/subject_lines.html
@@ -11,10 +11,8 @@
   <tr>
     <td class="label">Reply to E-mail Address</td>
     <td>
-      <select style="width: 200px" ng-model="mailA.replyto_email"
-              ng-options="frm.email as frm.email for frm in eMailing" >
-        <option value="">-none-</option>
-      </select>
+      <input type="hidden" replytoselect id= "replyToEmail"   ng-model="mailA.replyto_email"
+              ng-options="frm.email as frm.email for frm in eMailing" />
     </td>
   </tr>
   <tr>