crmMailingAB - report.html - Fix reload after submitting final

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index cf48eb372f861aac5a1bec58552732c34c9522dd..1ef737a4f868705b0058036644783385feb4ae1c 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -196,10 +196,10 @@
   angular.module('crmMailingAB').controller('CrmMailingABReportCtrl', function ($scope, crmApi, crmMailingStats) {
     var ts = $scope.ts = CRM.ts(null);
 
-    var activeMailingStatus = null, activeMailings = null;
+    var CrmMailingABReportCnt = 1, activeMailings = null;
     $scope.getActiveMailings = function() {
-      if ($scope.abtest.ab.status != activeMailingStatus) {
-        activeMailingStatus = $scope.abtest.ab.status;
+      if ($scope.abtest.$CrmMailingABReportCnt != CrmMailingABReportCnt) {
+        $scope.abtest.$CrmMailingABReportCnt = ++CrmMailingABReportCnt;
         activeMailings = [
           {name: 'a', title: ts('Mailing A'), mailing: $scope.abtest.mailings.a, attachments: $scope.abtest.attachments.a},
           {name: 'b', title: ts('Mailing B'), mailing: $scope.abtest.mailings.b, attachments: $scope.abtest.attachments.b}
@@ -249,8 +249,9 @@
         crmStatus({start: ts('Saving...'), success: ''}, abtest.save())
           .then(function () {
             return crmStatus({start: ts('Submitting...'), success: ts('Submitted')},
-              abtest.submitFinal().then(function(){
-                return abtest.load();
+              abtest.submitFinal().then(function(r){
+                delete abtest.$CrmMailingABReportCnt;
+                return r;
               }));
           })
           .then(function(){

diff --git a/js/angular-crmMailingAB/services.js b/js/angular-crmMailingAB/services.js
index 3b6123fa8af219777056c2ef02467864321776c2..c9c14b9a56a47c8da98970182a111cd666f676b6 100644 (file)
--- a/js/angular-crmMailingAB/services.js
+++ b/js/angular-crmMailingAB/services.js
@@ -155,7 +155,7 @@
         };
         return crmApi('MailingAB', 'submit', params)
           .then(function () {
-            return crmMailingAB;
+            return crmMailingAB.load();
           });
       },
       // @param mailing Object (per APIv3)