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

Merge pull request #4670 from jaredevantabor/lookup-modal-search-tags

Browse Source 
Hiding default search param as a search tag
This commit is contained in:
Jared Tabor
2017-01-11 15:01:54 -08:00
committed by GitHub
parent 945d5a68f5 82f16f0551
commit 258405aefe
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,20 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
// setting the default value of a term to null in a state definition is a very explicit way to ensure it will NEVER generate a search tag, even with a non-default value // setting the default value of a term to null in a state definition is a very explicit way to ensure it will NEVER generate a search tag, even with a non-default value
return defaults[key] !== value && key !== 'order_by' && key !== 'page' && key !== 'page_size' && defaults[key] !== null; return defaults[key] !== value && key !== 'order_by' && key !== 'page' && key !== 'page_size' && defaults[key] !== null;
}); });
return _(stripped).map(qs.decodeParam).flatten().value(); let strippedCopy = _.cloneDeep(stripped);
if(_.keys(_.pick(defaults, _.keys(strippedCopy))).length > 0){
for (var key in strippedCopy) {
if (strippedCopy.hasOwnProperty(key)) {
let value = strippedCopy[key];
if(_.isArray(value)){
let index = _.indexOf(value, defaults[key]);
value = value.splice(index, 1)[0];
}
}
}
stripped = strippedCopy;
}
return _(strippedCopy).map(qs.decodeParam).flatten().value();
} }
// searchable relationships // searchable relationships