External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-17 00:47:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-946: deferred host filter until after edit window is dismissed and only if save button clicked..

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-17 13:41:09 -05:00
parent 6972b32e8b
commit b8f68f7b79
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,10 +599,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
// Load the modal form // Load the modal form
var scope = generator.inject(form, { mode: 'edit', modal: true, related: false, show_modal: false }); var scope = generator.inject(form, { mode: 'edit', modal: true, related: false, show_modal: false });
generator.reset(); generator.reset();
// Change the selected group
if (parent_scope.selected_tree_id !== tree_id)
parent_scope.showHosts(tree_id, group_id, false);
GetSourceTypeOptions({ scope: scope, variable: 'source_type_options' }); GetSourceTypeOptions({ scope: scope, variable: 'source_type_options' });
@@ -823,12 +819,20 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
} }
}); });
//Clean up //Clean up
scope.searchCleanup(); if (scope.searchCleanUp)
scope.searchCleanup();
scope.formModalActionDisabled = false; scope.formModalActionDisabled = false;
scope.showGroupHelp = false; //get rid of the Hint scope.showGroupHelp = false; //get rid of the Hint
Wait('stop');
$('#form-modal').modal('hide'); $('#form-modal').modal('hide');
}
// Change the selected group
if (parent_scope.selected_tree_id !== tree_id)
parent_scope.showHosts(tree_id, group_id, false);
}
else {
Wait('stop');
}
}); });
if (scope.removeFormSaveSuccess) { if (scope.removeFormSaveSuccess) {