From f67227ad67bc268e7e848359698b5703d60e9c2c Mon Sep 17 00:00:00 2001 From: chris Houseknecht Date: Thu, 16 Jan 2014 17:38:49 -0500 Subject: [PATCH] Activity Stream: when object selector changes page refreshes with matching rows. --- awx/ui/static/js/helpers/Groups.js | 6 ++++-- awx/ui/static/js/helpers/search.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js index 41017e3ac7..490f3f0f06 100644 --- a/awx/ui/static/js/helpers/Groups.js +++ b/awx/ui/static/js/helpers/Groups.js @@ -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'); }); diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js index ccc1599c6c..e61e1632ba 100644 --- a/awx/ui/static/js/helpers/search.js +++ b/awx/ui/static/js/helpers/search.js @@ -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); } }