External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Handle delete wfjt error with basic license. Remove old 402 logic for hiding wf permissions tab

Browse Source
This commit is contained in:
mabashian
2017-08-22 11:09:52 -04:00
parent 031b5f3269
commit 03903c59b6
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
View File

@@ -41,7 +41,6 @@
<div class="Form-tab" <div class="Form-tab"
ng-click="selectTab('workflow_templates')" ng-click="selectTab('workflow_templates')"
ng-class="{'is-selected': tab.workflow_templates}" ng-class="{'is-selected': tab.workflow_templates}"
ng-hide="resolve.workflowTemplatesDataset.status === 402"
translate> translate>
Workflow Templates Workflow Templates
</div> </div>
@@ -74,7 +73,7 @@
<div id="AddPermissions-jobTemplates" class="AddPermissions-list" ng-show="tab.job_templates"> <div id="AddPermissions-jobTemplates" class="AddPermissions-list" ng-show="tab.job_templates">
<rbac-multiselect-list view="JobTemplates" all-selected="allSelected" dataset="resolve.jobTemplatesDataset"></rbac-multiselect-list> <rbac-multiselect-list view="JobTemplates" all-selected="allSelected" dataset="resolve.jobTemplatesDataset"></rbac-multiselect-list>
</div> </div>
<div ng-if="resolve.workflowTemplatesDataset.status !== 402" id="AddPermissions-workflowTemplates" class="AddPermissions-list" ng-show="tab.workflow_templates"> <div id="AddPermissions-workflowTemplates" class="AddPermissions-list" ng-show="tab.workflow_templates">
<rbac-multiselect-list view="WorkflowTemplates" all-selected="allSelected" dataset="resolve.workflowTemplatesDataset"></rbac-multiselect-list> <rbac-multiselect-list view="WorkflowTemplates" all-selected="allSelected" dataset="resolve.workflowTemplatesDataset"></rbac-multiselect-list>
</div> </div>
<div id="AddPermissions-projects" class="AddPermissions-list" ng-show="tab.projects"> <div id="AddPermissions-projects" class="AddPermissions-list" ng-show="tab.projects">

4
awx/ui/client/src/shared/smart-search/queryset.service.js
View File

@@ -243,10 +243,6 @@ export default ['$q', 'Rest', 'ProcessErrors', '$rootScope', 'Wait', 'DjangoSear
.catch(function(response) { .catch(function(response) {
Wait('stop'); Wait('stop');
if (/^\/api\/v[0-9]+\/workflow_job_templates\/$/.test(endpoint) && response.status === 402) {
return response;
}
this.error(response.data, response.status); this.error(response.data, response.status);
throw response; throw response;

14
awx/ui/client/src/templates/list/templates-list.controller.js
View File

@@ -128,20 +128,22 @@ export default ['$scope', '$rootScope',
TemplatesService.deleteWorkflowJobTemplate(template.id) TemplatesService.deleteWorkflowJobTemplate(template.id)
.then(function () { .then(function () {
handleSuccessfulDelete(true); handleSuccessfulDelete(true);
}, function (data) { })
.catch(function (response) {
Wait('stop'); Wait('stop');
ProcessErrors($scope, data, data.status, null, { hdr: 'Error!', ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!',
msg: 'Call to delete workflow job template failed. DELETE returned status: ' + status }); 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')) { else if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) {
TemplatesService.deleteJobTemplate(template.id) TemplatesService.deleteJobTemplate(template.id)
.then(function () { .then(function () {
handleSuccessfulDelete(); handleSuccessfulDelete();
}, function (data) { })
.catch(function (response) {
Wait('stop'); Wait('stop');
ProcessErrors($scope, data, data.status, null, { hdr: 'Error!', ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!',
msg: 'Call to delete job template failed. DELETE returned status: ' + data.status }); msg: 'Call to delete job template failed. DELETE returned status: ' + response.status + '.'});
}); });
} }
else { else {