shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Code Releases Activity

Activity Stream: when object selector changes page refreshes with matching rows.

Browse Source
This commit is contained in:
chris Houseknecht 2014-01-16 17:38:49 -05:00
parent 79f2d1cd88
commit f67227ad67
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,7 +603,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
generator.reset();
// Change the selected group
parent_scope.showHosts(tree_id, group_id, false);
if (parent_scope.selected_tree_id !== tree_id)
parent_scope.showHosts(tree_id, group_id, false);
GetSourceTypeOptions({ scope: scope, variable: 'source_type_options' });
@ -1037,7 +1038,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
var node = Find({ list: scope.groups, key: 'id', val: tree_id });
var url = GetBasePath('inventory') + inventory_id + '/groups/';
scope.showHosts(tree_id, group_id, false);
if (scope.selected_tree_id != tree_id)
scope.showHosts(tree_id, group_id, false);
var action_to_take = function() {
$('#prompt-modal').on('hidden.bs.modal', function(){ Wait('start'); });

4
awx/ui/static/js/helpers/search.js
View File

@ -356,7 +356,11 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
*/
}
else {
// Search value is empty
scope[iterator + 'ShowStartBtn' + modifier] = true;
scope[iterator + 'SearchParams'] += '&' +
list.fields[scope[iterator + 'SearchField' + modifier]].searchField +
'=' + list.fields[scope[iterator + 'SearchField' + modifier]].searchObject;
//scope.$emit('foundObject', iterator, page, load, spin, i, null);
}
}