External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #375 from mabashian/7545-cancel-flash

Browse Source 
Fix cancel delete button flash
This commit is contained in:
Michael Abashian
2017-08-31 14:51:46 -04:00
committed by GitHub
parent 381a27957a e60fcf93ba
commit ddc2af0691
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/src/projects/projects.list.js
View File

@@ -116,13 +116,13 @@ export default ['i18n', function(i18n) {
"delete": { "delete": {
ngClick: "deleteProject(project.id, project.name)", ngClick: "deleteProject(project.id, project.name)",
awToolTip: i18n._('Delete the project'), awToolTip: i18n._('Delete the project'),
ngShow: "(project.status !== 'updating' && project.status !== 'running' && project.status !== 'pending') && project.summary_fields.user_capabilities.delete", ngShow: "(project.status !== 'updating' && project.status !== 'running' && project.status !== 'pending' && project.status !== 'waiting') && project.summary_fields.user_capabilities.delete",
dataPlacement: 'top' dataPlacement: 'top'
}, },
cancel: { cancel: {
ngClick: "cancelUpdate(project)", ngClick: "cancelUpdate(project)",
awToolTip: i18n._('Cancel the SCM update'), awToolTip: i18n._('Cancel the SCM update'),
ngShow: "(project.status == 'updating' || project.status == 'running' || project.status == 'pending') && project.summary_fields.user_capabilities.start", ngShow: "(project.status == 'updating' || project.status == 'running' || project.status == 'pending' || project.status == 'waiting') && project.summary_fields.user_capabilities.start",
dataPlacement: 'top', dataPlacement: 'top',
ngDisabled: "project.pending_cancellation || project.status == 'canceled'" ngDisabled: "project.pending_cancellation || project.status == 'canceled'"
} }