Shows the Cancel button on the jobs list for a running system job

This commit is contained in:
Jared Tabor
2018-06-22 17:56:26 -07:00
parent ccd8a48617
commit d468f829dd

View File

@@ -74,10 +74,13 @@
ng-show="job.summary_fields.user_capabilities.start"> ng-show="job.summary_fields.user_capabilities.start">
</at-relaunch> </at-relaunch>
<at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)" <at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)"
ng-show="job.summary_fields.user_capabilities.start && ng-show="(job.summary_fields.user_capabilities.start &&
(job.status === 'pending' || (job.status === 'pending' ||
job.status === 'waiting' || job.status === 'waiting' ||
job.status === 'running')"> job.status === 'running')) || ($root.user_is_superuser && job.type === 'system_job' &&
(job.status === 'pending' ||
job.status === 'waiting' ||
job.status === 'running'))">
</at-row-action> </at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)" <at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)"
ng-show="job.summary_fields.user_capabilities.delete && ng-show="job.summary_fields.user_capabilities.delete &&