From: Tim Otten Date: Thu, 19 Feb 2015 22:59:04 +0000 (-0800) Subject: crmMailingAB - report.html - Fix reload after submitting final X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00d99fa71b1de7c746994efd91a24886ea15964b;p=civicrm-core.git crmMailingAB - report.html - Fix reload after submitting final --- diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js index cf48eb372f..1ef737a4f8 100644 --- 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 3b6123fa8a..c9c14b9a56 100644 --- 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)