External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 07:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove pending_deletion button bug from inventory list

Browse Source
This commit is contained in:
Marliana Lara
2018-03-27 14:26:20 -04:00
parent 9b30b02acb
commit 492e74a345
2 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
View File

@@ -113,7 +113,7 @@ export default ['i18n', function(i18n) {
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: i18n._('Copy inventory'), awToolTip: i18n._('Copy inventory'),
dataPlacement: 'top', dataPlacement: 'top',
ngShow: 'inventory.summary_fields.user_capabilities.edit' ngShow: '!inventory.pending_deletion && inventory.summary_fields.user_capabilities.edit'
}, },
view: { view: {
label: i18n._('View'), label: i18n._('View'),

3
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -395,7 +395,7 @@ export default ['$compile', 'Attr', 'Icon',
} }
if (field_action === 'pending_deletion') { if (field_action === 'pending_deletion') {
innerTable += `<a ng-if='${list.iterator}.pending_deletion'>Pending Delete</a>`; innerTable += `<a ng-if='${list.iterator}.pending_deletion'>Pending Delete</a>`;
} } else {
// Plug in Dropdown Component // Plug in Dropdown Component
if (field_action === 'submit' && list.fieldActions[field_action].relaunch === true) { if (field_action === 'submit' && list.fieldActions[field_action].relaunch === true) {
innerTable += `<at-relaunch job="${list.iterator}"></at-relaunch>`; innerTable += `<at-relaunch job="${list.iterator}"></at-relaunch>`;
@@ -455,6 +455,7 @@ export default ['$compile', 'Attr', 'Icon',
} }
} }
} }
}
innerTable += "</div></td>\n"; innerTable += "</div></td>\n";
} }