External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Tweaked inventory group delete help link and text.

Browse Source
This commit is contained in:
chouseknecht 2014-05-19 11:24:29 -04:00
parent fe29db1a46
commit 66862abd0c
2 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
awx/ui/static/js/helpers/Groups.js
View File

@ -1290,8 +1290,9 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
scope.deleteOption = "preserve-all";
scope.helpText = "<dl><dt>Delete</dt><dd>Remove from inventory all groups and hosts associated with the group being deleted. " +
"If a group or host is associated with other groups, it will not be removed from the inventory.</dd>\n" +
scope.helpText = "<dl><dt>Delete</dt><dd>Deletes all 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 one level.</dd></dl>\n" +
"<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
@ -1436,53 +1437,6 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
});
});
/*if (scope.removeDeleteNextGroup) {
scope.removeDeleteNextGroup();
}
scope.removeDeleteNextGroup = scope.$on('DeleteNextGroup', function() {
var group,
url = GetBasePath('inventory') + scope.inventory_id + '/groups/';
if (groups && groups.length > 0) {
group = groups.pop();
// GetBasePath('groups') + group.id + '/'
Rest.setUrl(url);
Rest.post({ id: group.id, disassociate: 1 })
.success(function() {
scope.$emit('DeleteNextGroup');
})
.error( function(data, status) {
$log.error('Failed to delete group ' + group.group_id + '. Status: ' + status);
scope.$emit('DeleteNextGroup');
});
}
else {
scope.$emit('ChildDeleteFinished');
}
});
*/
/*if (scope.removeDeleteNextHost) {
scope.removeDeleteNextHost();
}
scope.removeDeleteNextHost = scope.$on('DeleteNextHost', function() {
var host;
if (hosts && hosts.length > 0) {
host = hosts.pop();
Rest.setUrl(GetBasePath('hosts') + host.id + '/');
Rest.destroy()
.success(function() {
scope.$emit('DeleteNextHost');
})
.error( function(data, status) {
$log.error('Failed to delete host ' + host.id + '. Status: ' + status);
scope.$emit('DeleteNextHost');
});
}
else {
scope.$emit('DeleteNextGroup');
}
});*/
scope.cancel = function() {
$('#group-delete-dialog').dialog('close');
};
@ -1490,7 +1444,8 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
scope.performDelete = function() {
$('#group-delete-dialog').dialog('close');
Wait('start');
if (scope.deleteOption === 'delete-all') {
if (scope.deleteOption === 'delete-all' || (scope.groupsCount === 0 && scope.hostsCount === 0)) {
// If user chooses Delete or there are no children, send DELETE request
scope.$emit('DeleteGroup');
}
else {

2
awx/ui/static/partials/inventory-edit.html
View File

@ -97,7 +97,7 @@
</div>
<div class="help-container">
<div class="help-container" style="text-align:right;">
<a href="" id="awp-promote" href="" aw-pop-over="{{ helpText }}" aw-tool-tip="Click for help" aw-pop-over-watch="helpText" data-placement="top" data-container="body" data-title="Help" class="help-link"><i class="fa fa-question-circle"></i> click for help</a>
</div>