From 72372b38103d8118b2afc65093376f3ab8a3273e Mon Sep 17 00:00:00 2001 From: mabashian Date: Sat, 25 Aug 2018 14:00:24 -0400 Subject: [PATCH] Makes search filters additive again --- awx/ui/client/src/shared/smart-search/queryset.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js index d1e2fbe9c4..9e6f2a2b98 100644 --- a/awx/ui/client/src/shared/smart-search/queryset.service.js +++ b/awx/ui/client/src/shared/smart-search/queryset.service.js @@ -336,7 +336,7 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc mergeQueryset (queryset, additional, singleSearchParam) { const space = '%20and%20'; - const merged = _.merge({}, queryset, additional, (objectValue, sourceValue, key, object) => { + const merged = _.mergeWith({}, queryset, additional, (objectValue, sourceValue, key, object) => { if (!(object[key] && object[key] !== sourceValue)) { // // https://lodash.com/docs/3.10.1#each // If this returns undefined merging is handled by default _.merge algorithm