From 6c2ea0a7bbb1a8457030fdffd97b98b698e2743b Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 5 Nov 2013 21:10:31 +0000 Subject: [PATCH] AC-559 Changed reset filter to clear the search and remove search keys from the URL displayed in the browser. Removing search keys from URL requires resetting window.location, which does to a page refresh. O'well. --- awx/ui/static/js/helpers/search.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js index 40cd8d46b1..00fc5d7ee4 100644 --- a/awx/ui/static/js/helpers/search.js +++ b/awx/ui/static/js/helpers/search.js @@ -16,7 +16,7 @@ */ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) - .factory('SearchInit', ['Alert', 'Rest', 'Refresh', function(Alert, Rest, Refresh) { + .factory('SearchInit', ['Alert', 'Rest', 'Refresh', '$location', function(Alert, Rest, Refresh, $location) { return function(params) { var scope = params.scope; @@ -132,14 +132,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) scope[iterator + 'HideSearchType'] = false; scope[iterator + 'InputHide'] = false; scope[iterator + 'InputDisable'] = false; - for (fld in list.fields) { - if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) { - scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label; - scope[iterator + 'SearchField'] = fld; - break; - } - } - scope.search(iterator); + // Force removal of search keys from the URL + window.location = '/#' + $location.path(); } scope.setSearchType = function(iterator, type, label) {