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

Merge pull request #1313 from jakemcdermott/fix-delete-cancel-urls

Browse Source 
use ordained list of statuses for showing cancel/delete
This commit is contained in:
Jake McDermott 2018-04-10 12:07:26 -04:00 committed by GitHub
commit 1961f99106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/features/output/details.partial.html
View File

@ -12,7 +12,10 @@
class="List-actionButton List-actionButton--delete"
data-placement="top"
ng-click="vm.cancelJob()"
ng-show="vm.status.value === 'Running'|| vm.status.value ==='Pending'"
ng-show="vm.status.value === 'New' ||
vm.status.value === 'Pending' ||
vm.status.value === 'Waiting' ||
vm.status.value === 'Running'"
aw-tool-tip="{{'Cancel' | translate }}"
data-original-title=""
title="">
@ -24,9 +27,11 @@
class="List-actionButton List-actionButton--delete"
data-placement="top"
ng-click="vm.deleteJob()"
ng-hide="!vm.canDelete
|| vm.status.value === 'Running'
|| vm.status.value === 'Pending'"
ng-show="vm.canDelete && (
vm.status.value === 'Successful' ||
vm.status.value === 'Failed' ||
vm.status.value === 'Error' ||
vm.status.value === 'Canceled')"
aw-tool-tip="{{ 'Delete' | translate }}"
data-original-title=""
title="">