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

Merge pull request #571 from jaredevantabor/6551

Browse Source 
Band aid for rapidly deleting groups
This commit is contained in:
Jared Tabor
2017-11-03 16:28:22 -07:00
committed by GitHub
parent 7149c41804 f65ef9f75c
commit 96fbc9ea27
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js
View File

@@ -141,9 +141,11 @@
} else { } else {
$state.go($state.current, reloadListStateParams, {reload: true}); $state.go($state.current, reloadListStateParams, {reload: true});
} }
$('#group-delete-modal').modal('hide'); setTimeout(function(){
$('body').removeClass('modal-open'); $('#group-delete-modal').modal('hide');
$('.modal-backdrop').remove(); $('body').removeClass('modal-open');
$('.modal-backdrop').remove();
}, 1000);
}); });
break; break;
default: default:
@@ -153,9 +155,11 @@
} else { } else {
$state.go($state.current, reloadListStateParams, {reload: true}); $state.go($state.current, reloadListStateParams, {reload: true});
} }
$('#group-delete-modal').modal('hide'); setTimeout(function(){
$('body').removeClass('modal-open'); $('#group-delete-modal').modal('hide');
$('.modal-backdrop').remove(); $('body').removeClass('modal-open');
$('.modal-backdrop').remove();
}, 1000);
}); });
} }
}; };

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html
View File

@@ -5,7 +5,7 @@
<div class="Modal-title ng-binding"> <div class="Modal-title ng-binding">
<span translate>Delete Group</span> <span translate>Delete Group</span>
<a href="" id="awp-promote" href="" <a href="" id="awp-promote" href=""
aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd>\n<dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>\n" aw-tool-tip="Click for help" aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd><dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>" aw-tool-tip="Click for help"
data-placement="right" data-placement="right"
data-container="body" data-container="body"
data-title="Delete Group" data-title="Delete Group"