zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 15:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

show filterable:true for filterable fields

Browse Source
This commit is contained in:
Jake McDermott
2018-05-03 16:45:09 -04:00
parent a9c9646060
commit 0682d19d5e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/src/shared/smart-search/smart-search.controller.js
+5 -4
View File
@@ -53,7 +53,7 @@ function SmartSearchController (
$scope.models = data.models;
$scope.options = data.options.data;
$scope.keyFields = _.reduce(data.models[$scope.djangoModel].base, function(result, value, key) {
if (!(typeof value.filterable === "boolean" && value.filterable === false)) {
if (value.filterable) {
result.push(key);
}
return result;
@@ -150,10 +150,11 @@ function SmartSearchController (
const listName = $scope.list.name;
const baseFieldPath = `models.${listName}.base.${rootField}`;
const isBaseField = _.has($scope, `${baseFieldPath}`);
const filterable = _.get($scope, `${baseFieldPath}.filterable`);
const isNotFilterable = typeof filterable === "boolean" && filterable === false;
const isFilterable = _.get($scope, `${baseFieldPath}.filterable`);
const isBaseModelRelatedSearchTermField = (_.get($scope, `${baseFieldPath}.type`) === 'field');
return isBaseField && !isBaseModelRelatedSearchTermField && !isNotFilterable;
return isBaseField && !isBaseModelRelatedSearchTermField && isFilterable;
}
function isRelatedField (termParts) {