diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html index db62000173..23d6ed36b1 100644 --- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html +++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html @@ -41,7 +41,6 @@
Workflow Templates
@@ -74,7 +73,7 @@
-
+
diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js index 8dceeb399a..ec54dfd4c7 100644 --- a/awx/ui/client/src/shared/smart-search/queryset.service.js +++ b/awx/ui/client/src/shared/smart-search/queryset.service.js @@ -243,10 +243,6 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear .catch(function(response) { Wait('stop'); - if (/^\/api\/v[0-9]+\/workflow_job_templates\/$/.test(endpoint) && response.status === 402) { - return response; - } - this.error(response.data, response.status); throw response; diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js index 664c94f70c..10801d6e61 100644 --- a/awx/ui/client/src/templates/list/templates-list.controller.js +++ b/awx/ui/client/src/templates/list/templates-list.controller.js @@ -128,20 +128,22 @@ export default ['$scope', '$rootScope', TemplatesService.deleteWorkflowJobTemplate(template.id) .then(function () { handleSuccessfulDelete(true); - }, function (data) { + }) + .catch(function (response) { Wait('stop'); - ProcessErrors($scope, data, data.status, null, { hdr: 'Error!', - msg: 'Call to delete workflow job template failed. DELETE returned status: ' + status }); + ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!', + msg: 'Call to delete workflow job template failed. DELETE returned status: ' + response.status + '.'}); }); } else if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) { TemplatesService.deleteJobTemplate(template.id) .then(function () { handleSuccessfulDelete(); - }, function (data) { + }) + .catch(function (response) { Wait('stop'); - ProcessErrors($scope, data, data.status, null, { hdr: 'Error!', - msg: 'Call to delete job template failed. DELETE returned status: ' + data.status }); + ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!', + msg: 'Call to delete job template failed. DELETE returned status: ' + response.status + '.'}); }); } else {