External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 20:07:37 -02: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
parent ec586de687 6768b10638
commit 1961f99106
1 changed files with 9 additions and 4 deletions
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" 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 === '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 }}" aw-tool-tip="{{'Cancel' | translate }}"
data-original-title="" data-original-title=""
title=""> title="">
@@ -24,9 +27,11 @@
class="List-actionButton List-actionButton--delete" class="List-actionButton List-actionButton--delete"
data-placement="top" data-placement="top"
ng-click="vm.deleteJob()" ng-click="vm.deleteJob()"
ng-hide="!vm.canDelete ng-show="vm.canDelete && (
|| vm.status.value === 'Running' vm.status.value === 'Successful' ||
|| vm.status.value === 'Pending'" vm.status.value === 'Failed' ||
vm.status.value === 'Error' ||
vm.status.value === 'Canceled')"
aw-tool-tip="{{ 'Delete' | translate }}" aw-tool-tip="{{ 'Delete' | translate }}"
data-original-title="" data-original-title=""
title=""> title="">