From b5a66693591b4a08d54eeb3da757e81491d22da9 Mon Sep 17 00:00:00 2001 From: Maximilian Krambach Date: Fri, 12 Apr 2019 11:50:32 +0200 Subject: [PATCH] Adds a 'tag' filter to motion lists --- .../services/motion-filter-list.service.ts | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/client/src/app/site/motions/services/motion-filter-list.service.ts b/client/src/app/site/motions/services/motion-filter-list.service.ts index e6ce4543d..bd205b058 100644 --- a/client/src/app/site/motions/services/motion-filter-list.service.ts +++ b/client/src/app/site/motions/services/motion-filter-list.service.ts @@ -14,6 +14,7 @@ import { MotionCommentSectionRepositoryService } from 'app/core/repositories/mot import { ConfigService } from 'app/core/ui-services/config.service'; import { ViewWorkflow } from '../models/view-workflow'; import { OperatorService } from 'app/core/core-services/operator.service'; +import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; @Injectable({ providedIn: 'root' @@ -31,7 +32,8 @@ export class MotionFilterListService extends BaseFilterListService { this.updateFilterDefinitions(this.filterOptions); @@ -313,4 +323,26 @@ export class MotionFilterListService extends BaseFilterListService { + const tagOptions: OsFilterOptions = tags.map(tag => ({ + condition: tag.id, + label: tag.name, + isActive: false + })); + if (tags.length) { + tagOptions.push('-'); + tagOptions.push({ + label: this.translate.instant('No tags'), + condition: null + }); + } + this.tagFilterOptions.options = tagOptions; + this.updateFilterDefinitions(this.filterOptions); + }); + } }