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

fixing cancel function for workflow results

Browse Source
This commit is contained in:
jaredevantabor
2017-02-07 16:04:05 -08:00
parent 48e75b3e19
commit db50779731
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/workflow-results/workflow-results.partial.html
View File

@@ -36,7 +36,7 @@
<button class="List-actionButton <button class="List-actionButton
List-actionButton--delete" List-actionButton--delete"
data-placement="top" data-placement="top"
ng-click="deleteJob()" ng-click="cancelJob()"
ng-show="workflow.status == 'running' || ng-show="workflow.status == 'running' ||
workflow.status=='pending' " workflow.status=='pending' "
aw-tool-tip="{{'Cancel'|translate}}" aw-tool-tip="{{'Cancel'|translate}}"

14
awx/ui/client/src/workflow-results/workflow-results.service.js
View File

@@ -106,20 +106,6 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
}); });
} }
}); });
Rest.destroy()
.success(function() {
Wait('stop');
$('#prompt-modal').modal('hide');
})
.error(function(obj, status) {
Wait('stop');
$('#prompt-modal').modal('hide');
ProcessErrors(null, obj, status, null, {
hdr: 'Error!',
msg: `Could not cancel workflow.
Returned status: ${status}`
});
});
}, },
actionText: 'CANCEL' actionText: 'CANCEL'
}); });