External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 12:40:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
use newly ordained list of statuses for showing cancel/delete
This commit is contained in:
Jake McDermott
2018-04-10 12:49:30 -04:00
committed by GitHub
parent 1961f99106 f0e0a8a338
commit 53944a2cf3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,7 @@
class="List-actionButton List-actionButton--delete" class="List-actionButton List-actionButton--delete"
data-placement="top" data-placement="top"
ng-click="vm.cancelJob()" ng-click="vm.cancelJob()"
ng-show="vm.status.value === 'New' || ng-show="vm.status.value === 'Pending' ||
vm.status.value === 'Pending' ||
vm.status.value === 'Waiting' || vm.status.value === 'Waiting' ||
vm.status.value === 'Running'" vm.status.value === 'Running'"
aw-tool-tip="{{'Cancel' | translate }}" aw-tool-tip="{{'Cancel' | translate }}"
@@ -28,6 +27,7 @@
data-placement="top" data-placement="top"
ng-click="vm.deleteJob()" ng-click="vm.deleteJob()"
ng-show="vm.canDelete && ( ng-show="vm.canDelete && (
vm.status.value === 'New' ||
vm.status.value === 'Successful' || vm.status.value === 'Successful' ||
vm.status.value === 'Failed' || vm.status.value === 'Failed' ||
vm.status.value === 'Error' || vm.status.value === 'Error' ||