CRM-15979 - crmMailingAB - Merge the compose and report URLs

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 0cacb6c974b9a8ac167f34b37a314051328cb342..93799708457a5324550e4419a7590a691e715b01 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -172,20 +172,18 @@
     });
   });
 
-  angular.module('crmMailingAB').controller('CrmMailingABReportCtrl', function ($scope, abtest, crmApi, crmMailingPreviewMgr, dialogService) {
+  angular.module('crmMailingAB').controller('CrmMailingABReportCtrl', function ($scope, crmApi, crmMailingPreviewMgr, dialogService) {
     var ts = $scope.ts = CRM.ts(null);
 
-    $scope.abtest = abtest;
-
     $scope.stats = {};
-    crmApi('Mailing', 'stats', {mailing_id: abtest.ab.mailing_id_a}).then(function(data){
-      $scope.stats.a = data.values[abtest.ab.mailing_id_a];
+    crmApi('Mailing', 'stats', {mailing_id: $scope.abtest.ab.mailing_id_a}).then(function(data){
+      $scope.stats.a = data.values[$scope.abtest.ab.mailing_id_a];
     });
-    crmApi('Mailing', 'stats', {mailing_id: abtest.ab.mailing_id_b}).then(function(data){
-      $scope.stats.b = data.values[abtest.ab.mailing_id_b];
+    crmApi('Mailing', 'stats', {mailing_id: $scope.abtest.ab.mailing_id_b}).then(function(data){
+      $scope.stats.b = data.values[$scope.abtest.ab.mailing_id_b];
     });
-    crmApi('Mailing', 'stats', {mailing_id: abtest.ab.mailing_id_c}).then(function(data){
-      $scope.stats.c = data.values[abtest.ab.mailing_id_c];
+    crmApi('Mailing', 'stats', {mailing_id: $scope.abtest.ab.mailing_id_c}).then(function(data){
+      $scope.stats.c = data.values[$scope.abtest.ab.mailing_id_c];
     });
 
     $scope.previewMailing = function previewMailing(mailingName, mode) {
@@ -193,7 +191,7 @@
     };
     $scope.selectWinner = function selectWinner(mailingName) {
       var model = {
-        abtest: abtest,
+        abtest: $scope.abtest,
         mailingName: mailingName
       };
       var options = CRM.utils.adjustDialogDefaults({

diff --git a/partials/crmMailingAB/edit.html b/partials/crmMailingAB/edit.html
index aafb88fb6c7437a13db0345c4a00213fe5267f83..74c1fc3b95813f5812c16934a12bb4496003f4f4 100644 (file)
--- a/partials/crmMailingAB/edit.html
+++ b/partials/crmMailingAB/edit.html
@@ -9,12 +9,12 @@
   individual field from B). At the end of the composition process, the controller's "sync" operation will
   merge shared settings from "A" into "B".
 -->
-<div ng-show="isSubmitted()">
-  {{ts('This mailing has been submitted.')}}
+<div ng-if="isSubmitted()">
+  <div ng-include="'~/crmMailingAB/report.html'"></div>
 </div>
 
-<form name="crmMailingAB" novalidate ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="abtest.getAutosaveSignature()" crm-autosave-if="sync()">
-  <div class="crm-block crm-form-block crmMailing">
+<form name="crmMailingAB" novalidate crm-autosave="save()" crm-autosave-model="abtest.getAutosaveSignature()" crm-autosave-if="sync()">
+  <div class="crm-block crm-form-block crmMailing" ng-if="!isSubmitted()">
     <div crm-ui-wizard>
       <div crm-ui-wizard-step="10" crm-title="ts('Setup')" ng-form="setupForm">
         <div

diff --git a/partials/crmMailingAB/list.html b/partials/crmMailingAB/list.html
index 66b35b6996dfcad3da26bf745abfd607c6c4c531..361f9c867c64c5a2f5ffd6b9ac388a7c8f4ac047 100644 (file)
--- a/partials/crmMailingAB/list.html
+++ b/partials/crmMailingAB/list.html
@@ -44,7 +44,7 @@ Required vars: mailingABList
       <td>{{mailingAB.created_date}}</td>
       <td>
         <a class="action-item crm-hover-button" ng-href="#/abtest/{{mailingAB.id}}" ng-show="mailingAB.status == 'Draft'">{{ts('Continue')}}</a>
-        <a class="action-item crm-hover-button" ng-href="#/abtest/{{mailingAB.id}}/report" ng-show="mailingAB.status != 'Draft'">{{ts('Results')}}</a>
+        <a class="action-item crm-hover-button" ng-href="#/abtest/{{mailingAB.id}}" ng-show="mailingAB.status != 'Draft'">{{ts('Results')}}</a>
       </td>
     </tr>
     </tbody>

diff --git a/partials/crmMailingAB/report.html b/partials/crmMailingAB/report.html
index 2b70a987a857ed3cff3052d9d2f11ac472df90a1..4913630e07e394608ffad9632c8e5cddc32748a8 100644 (file)
--- a/partials/crmMailingAB/report.html
+++ b/partials/crmMailingAB/report.html
@@ -1,9 +1,4 @@
-<div crm-ui-accordion crm-title="ts('Debug')" crm-collapsed="true">
-  <pre>{{abtest.ab|json}}</pre>
-  <pre>{{abtest.mailings|json}}</pre>
-</div>
-
-<div>
+<div ng-controller="CrmMailingABReportCtrl">
   <table>
     <thead>
     <tr>