X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Fangular-crmCaseType.js;h=d27c9655e55af073b551bfeda55cce4d7d69f025;hb=0112f1aedb9f0b62505a36481ad6eb869baa4546;hp=c7cfd6570e7fc53f02820168510ee921705eb801;hpb=13607d6e9346d7adeef72866afb4ded9046305d0;p=civicrm-core.git diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js index c7cfd6570e..d27c9655e5 100644 --- a/js/angular-crmCaseType.js +++ b/js/angular-crmCaseType.js @@ -128,6 +128,7 @@ crmCaseType.controller('CaseTypeCtrl', function($scope, crmApi, apiCalls) { $scope.partialUrl = partialUrl; + var ts = $scope.ts = CRM.ts('CiviCase'); $scope.activityStatuses = _.values(apiCalls.actStatuses.values); $scope.activityTypes = apiCalls.actTypes.values; @@ -311,11 +312,9 @@ $scope.toggleCaseType = function (caseType) { caseType.is_active = (caseType.is_active == '1') ? '0' : '1'; crmApi('CaseType', 'create', caseType, true) - .then(function (data) { - if (data.is_error) { - caseType.is_active = (caseType.is_active == '1') ? '0' : '1'; // revert - $scope.$digest(); - } + .catch(function (data) { + caseType.is_active = (caseType.is_active == '1') ? '0' : '1'; // revert + $scope.$digest(); }); }; $scope.deleteCaseType = function (caseType) { @@ -325,21 +324,17 @@ } }) .then(function (data) { - if (!data.is_error) { - delete caseTypes.values[caseType.id]; - $scope.$digest(); - } + delete caseTypes.values[caseType.id]; + $scope.$digest(); }); }; $scope.revertCaseType = function (caseType) { caseType.definition = 'null'; caseType.is_forked = '0'; crmApi('CaseType', 'create', caseType, true) - .then(function (data) { - if (data.is_error) { - caseType.is_forked = '1'; // restore - $scope.$digest(); - } + .catch(function (data) { + caseType.is_forked = '1'; // restore + $scope.$digest(); }); }; });