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

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.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-05 21:10:31 +00:00
parent be74d9d932
commit 6c2ea0a7bb
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
*/ */
angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) 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) { return function(params) {
var scope = params.scope; var scope = params.scope;
@@ -132,14 +132,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
scope[iterator + 'HideSearchType'] = false; scope[iterator + 'HideSearchType'] = false;
scope[iterator + 'InputHide'] = false; scope[iterator + 'InputHide'] = false;
scope[iterator + 'InputDisable'] = false; scope[iterator + 'InputDisable'] = false;
for (fld in list.fields) { // Force removal of search keys from the URL
if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) { window.location = '/#' + $location.path();
scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
scope[iterator + 'SearchField'] = fld;
break;
}
}
scope.search(iterator);
} }
scope.setSearchType = function(iterator, type, label) { scope.setSearchType = function(iterator, type, label) {