admin-config
Advanced tools
Comparing version 0.2.8 to 0.2.9
@@ -45,3 +45,10 @@ import Queries from './Queries' | ||
let allFilterValues = Object.assign({}, filterValues, view.permanentFilters()); | ||
let allFilterValues = {}; | ||
const permanentFilters = view.permanentFilters(); | ||
Object.keys(filterValues).forEach(key => { | ||
allFilterValues[key] = filterValues[key]; | ||
}); | ||
Object.keys(permanentFilters).forEach(key => { | ||
allFilterValues[key] = permanentFilters[key]; | ||
}); | ||
@@ -92,7 +99,9 @@ return this.getRawValues(view.entity, view.name(), view.type, page, view.perPage(), allFilterValues, view.filters(), sortField, sortDir, url) | ||
params._filters = {}; | ||
let filterName; | ||
let filterName, mappedValue; | ||
for (filterName in filterValues) { | ||
if (filterFields.hasOwnProperty(filterName) && filterFields[filterName].hasMaps()) { | ||
Object.assign(params._filters, filterFields[filterName].getMappedValue(filterValues[filterName])); | ||
mappedValue = filterFields[filterName].getMappedValue(filterValues[filterName]); | ||
Object.keys(mappedValue).forEach(key => { | ||
params._filters[key] = mappedValue[key]; | ||
}) | ||
continue; | ||
@@ -99,0 +108,0 @@ } |
{ | ||
"name": "admin-config", | ||
"version": "0.2.8", | ||
"version": "0.2.9", | ||
"private": false, | ||
@@ -5,0 +5,0 @@ "repository": { |
156308
4044