diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-04-08 18:39:09 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-04-08 18:39:09 +0300 |
commit | 43bdd56a4114843cc09a843661711654572f0964 (patch) | |
tree | e3e4f382115b8bc1fc047db61dd4d3f144dabfa0 /client/components | |
parent | a602f4b9ec68df8eefa57dba7e1772951d53cd4c (diff) | |
parent | fe285c62e12486a8848376531c89d7a4b11b7fa7 (diff) | |
download | wekan-43bdd56a4114843cc09a843661711654572f0964.tar.gz wekan-43bdd56a4114843cc09a843661711654572f0964.tar.bz2 wekan-43bdd56a4114843cc09a843661711654572f0964.zip |
Merge branch 'feature/filter-assignee' of https://github.com/daniel-eder/wekan into daniel-eder-feature/filter-assignee
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/sidebar/sidebarFilters.jade | 18 | ||||
-rw-r--r-- | client/components/sidebar/sidebarFilters.js | 5 |
2 files changed, 23 insertions, 0 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); |