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 #4982 from mabashian/4860-delete-tags

Browse Source 
Smart search tag deletion (again)
This commit is contained in:
Michael Abashian
2017-01-27 10:01:20 -05:00
committed by GitHub
parent cf084850c2 f7f92c961d
commit 99cd9d9d4b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,15 @@ export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', '
params.page = '1'; params.page = '1';
queryset = _.merge(queryset, params, (objectValue, sourceValue, key, object) => { queryset = _.merge(queryset, params, (objectValue, sourceValue, key, object) => {
if (object[key] && object[key] !== sourceValue){ if (object[key] && object[key] !== sourceValue){
return [object[key], sourceValue]; if(_.isArray(object[key])) {
// Add the new value to the array and return
object[key].push(sourceValue);
return object[key];
}
else {
// Start the array of keys
return [object[key], sourceValue];
}
} }
else { else {
// // https://lodash.com/docs/3.10.1#merge // // https://lodash.com/docs/3.10.1#merge