External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 15:09:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1438 from mabashian/1437-host-filter-tags

Browse Source 
Fixed bug where host filter search tags were not present
This commit is contained in:
Michael Abashian
2018-04-23 10:55:42 -04:00
committed by GitHub
parent df4f6ecfd6 d4f46fa0e4
commit 8c10a064f2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -155,16 +155,16 @@ function SmartSearchController (
const unmodifiedQueryset = _.clone(queryset); const unmodifiedQueryset = _.clone(queryset);
const searchInputQueryset = qs.getSearchInputQueryset(terms, isRelatedField, isAnsibleFactField, singleSearchParam); const searchInputQueryset = qs.getSearchInputQueryset(terms, isRelatedField, isAnsibleFactField, singleSearchParam);
const modifiedQueryset = qs.mergeQueryset(queryset, searchInputQueryset, singleSearchParam); queryset = qs.mergeQueryset(queryset, searchInputQueryset, singleSearchParam);
// Go back to the first page after a new search // Go back to the first page after a new search
delete modifiedQueryset.page; delete queryset.page;
// https://ui-router.github.io/docs/latest/interfaces/params.paramdeclaration.html#dynamic // https://ui-router.github.io/docs/latest/interfaces/params.paramdeclaration.html#dynamic
// This transition will not reload controllers/resolves/views but will register new // This transition will not reload controllers/resolves/views but will register new
// $stateParams[searchKey] terms. // $stateParams[searchKey] terms.
if (!$scope.querySet) { if (!$scope.querySet) {
$state.go('.', { [searchKey]: modifiedQueryset }) $state.go('.', { [searchKey]: queryset })
.then(() => { .then(() => {
// same as above in $scope.remove. For some reason deleting the page // same as above in $scope.remove. For some reason deleting the page
// from the queryset works for all lists except lists in modals. // from the queryset works for all lists except lists in modals.
@@ -172,10 +172,10 @@ function SmartSearchController (
}); });
} }
qs.search(path, modifiedQueryset) qs.search(path, queryset)
.then(({ data }) => { .then(({ data }) => {
if ($scope.querySet) { if ($scope.querySet) {
$scope.querySet = modifiedQueryset; $scope.querySet = queryset;
} }
$scope.dataset = data; $scope.dataset = data;
$scope.collection = data.results; $scope.collection = data.results;
@@ -191,10 +191,10 @@ function SmartSearchController (
const { singleSearchParam } = $scope; const { singleSearchParam } = $scope;
const [term] = $scope.searchTags.splice(index, 1); const [term] = $scope.searchTags.splice(index, 1);
const modifiedQueryset = qs.removeTermsFromQueryset(queryset, term, isRelatedField, singleSearchParam); queryset = qs.removeTermsFromQueryset(queryset, term, isRelatedField, singleSearchParam);
if (!$scope.querySet) { if (!$scope.querySet) {
$state.go('.', { [searchKey]: modifiedQueryset }) $state.go('.', { [searchKey]: queryset })
.then(() => { .then(() => {
// for some reason deleting a tag from a list in a modal does not // for some reason deleting a tag from a list in a modal does not
// remove the param from $stateParams. Here we'll manually check to make sure // remove the param from $stateParams. Here we'll manually check to make sure