summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorDaniel Eder <danieleder@outlook.at>2020-04-08 16:54:11 +0300
committerDaniel Eder <danieleder@outlook.at>2020-04-08 16:59:59 +0300
commitfe285c62e12486a8848376531c89d7a4b11b7fa7 (patch)
treeb3d180f9f33ca76742cdf2b8862739dc92c16daf /client
parent9083c341c146952241f84e9cb997c307d5830a16 (diff)
downloadwekan-fe285c62e12486a8848376531c89d7a4b11b7fa7.tar.gz
wekan-fe285c62e12486a8848376531c89d7a4b11b7fa7.tar.bz2
wekan-fe285c62e12486a8848376531c89d7a4b11b7fa7.zip
Add filter option for assignee
Works exactly like member
Diffstat (limited to 'client')
-rw-r--r--client/components/sidebar/sidebarFilters.jade18
-rw-r--r--client/components/sidebar/sidebarFilters.js5
-rw-r--r--client/lib/filter.js10
3 files changed, 32 insertions, 1 deletions
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade
index 7f31dada..6d899b70 100644
--- a/client/components/sidebar/sidebarFilters.jade
+++ b/client/components/sidebar/sidebarFilters.jade
@@ -46,6 +46,24 @@ template(name="filterSidebar")
i.fa.fa-check
hr
ul.sidebar-list
+ li(class="{{#if Filter.assignees.isSelected undefined}}active{{/if}}")
+ a.name.js-toggle-assignee-filter
+ span.sidebar-list-item-description
+ | {{_ 'filter-no-assignee'}}
+ if Filter.assignees.isSelected undefined
+ i.fa.fa-check
+ each currentBoard.activeMembers
+ with getUser userId
+ li(class="{{#if Filter.assignees.isSelected _id}}active{{/if}}")
+ a.name.js-toggle-assignee-filter
+ +userAvatar(userId=this._id)
+ span.sidebar-list-item-description
+ = profile.fullname
+ | (<span class="username">{{ username }}</span>)
+ if Filter.assignees.isSelected _id
+ i.fa.fa-check
+ hr
+ ul.sidebar-list
li(class="{{#if Filter.customFields.isSelected undefined}}active{{/if}}")
a.name.js-toggle-custom-fields-filter
span.sidebar-list-item-description
diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js
index ee0176b9..0d402ab5 100644
--- a/client/components/sidebar/sidebarFilters.js
+++ b/client/components/sidebar/sidebarFilters.js
@@ -18,6 +18,11 @@ BlazeComponent.extendComponent({
Filter.members.toggle(this.currentData()._id);
Filter.resetExceptions();
},
+ 'click .js-toggle-assignee-filter'(evt) {
+ evt.preventDefault();
+ Filter.assignees.toggle(this.currentData()._id);
+ Filter.resetExceptions();
+ },
'click .js-toggle-archive-filter'(evt) {
evt.preventDefault();
Filter.archive.toggle(this.currentData()._id);
diff --git a/client/lib/filter.js b/client/lib/filter.js
index 592eb4ab..24ca320b 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -459,13 +459,21 @@ Filter = {
// before changing the schema.
labelIds: new SetFilter(),
members: new SetFilter(),
+ assignees: new SetFilter(),
archive: new SetFilter(),
hideEmpty: new SetFilter(),
customFields: new SetFilter('_id'),
advanced: new AdvancedFilter(),
lists: new AdvancedFilter(), // we need the ability to filter list by name as well
- _fields: ['labelIds', 'members', 'archive', 'hideEmpty', 'customFields'],
+ _fields: [
+ 'labelIds',
+ 'members',
+ 'assignees',
+ 'archive',
+ 'hideEmpty',
+ 'customFields',
+ ],
// We don't filter cards that have been added after the last filter change. To
// implement this we keep the id of these cards in this `_exceptions` fields