ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4688 from MaximilianKrambach/multiFilter

Browse Source 
fix number array filter options
This commit is contained in:
Emanuel Schütze 2019-05-10 11:32:28 +02:00 committed by GitHub
commit 643bab111c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/core/ui-services/base-filter-list.service.ts
View File

@ -209,7 +209,12 @@ export abstract class BaseFilterListService<V extends BaseViewModel> {
} }
if (matchingStoreFilter && matchingStoreFilter.options) { if (matchingStoreFilter && matchingStoreFilter.options) {
const storedOption = matchingStoreFilter.options.find( const storedOption = matchingStoreFilter.options.find(
o => typeof o !== 'string' && o.condition === option.condition o =>
typeof o !== 'string' &&
(o.condition === option.condition ||
(Array.isArray(o.condition) &&
Array.isArray(option.condition) &&
o.label === option.label))
) as OsFilterOption; ) as OsFilterOption;
if (storedOption) { if (storedOption) {
option.isActive = storedOption.isActive; option.isActive = storedOption.isActive;