zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-01 04:11:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upgrades lodash to ~4.17.10

Browse Source
This commit is contained in:
mabashian
2018-08-17 15:59:00 -04:00
parent 1b8cb45024
commit f1e0c1e977
15 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ function SmartSearchController (
const listName = $scope.list.name;
const baseRelatedTypePath = `models.${listName}.base.${rootField}.type`;
const isRelatedSearchTermField = (_.contains($scope.models[listName].related, rootField));
const isRelatedSearchTermField = (_.includes($scope.models[listName].related, rootField));
const isBaseModelRelatedSearchTermField = (_.get($scope, baseRelatedTypePath) === 'field');
return (isRelatedSearchTermField || isBaseModelRelatedSearchTermField);
@@ -254,7 +254,7 @@ function SmartSearchController (
defaults[key] = queryset[key];
}
});
const cleared = _(defaults).omit(_.isNull).value();
const cleared = _(defaults).omitBy(_.isNull).value();
delete cleared.page;
queryset = cleared;