diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-19 18:40:03 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-19 18:40:03 +0300 |
commit | 38ab2b766d8924ab9049b54a0778eb9273241c9b (patch) | |
tree | 12cee0e524cc087dcebba7248484fe82759bd704 /client/components/sidebar | |
parent | 8101d7ade85dbdf6dad95d96a937bf9718630373 (diff) | |
parent | 410e5aa28d065508558fdc46fa82bd540d21b97a (diff) | |
download | wekan-38ab2b766d8924ab9049b54a0778eb9273241c9b.tar.gz wekan-38ab2b766d8924ab9049b54a0778eb9273241c9b.tar.bz2 wekan-38ab2b766d8924ab9049b54a0778eb9273241c9b.zip |
Merge branch 'feuerball11-feature-custom-fields-filter' into devel
Diffstat (limited to 'client/components/sidebar')
-rw-r--r-- | client/components/sidebar/sidebarFilters.jade | 15 | ||||
-rw-r--r-- | client/components/sidebar/sidebarFilters.js | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 273df8c2..5f9fcf72 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -40,6 +40,21 @@ template(name="filterSidebar") | (<span class="username">{{ username }}</span>) if Filter.members.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 + | {{_ 'filter-no-custom-fields'}} + if Filter.customFields.isSelected undefined + i.fa.fa-check + each currentBoard.customFields + li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}") + a.name.js-toggle-custom-fields-filter + span.sidebar-list-item-description + {{ name }} + if Filter.customFields.isSelected _id + i.fa.fa-check if Filter.isActive hr a.sidebar-btn.js-clear-all diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index f02d3a4a..ba2633de 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -11,6 +11,11 @@ BlazeComponent.extendComponent({ Filter.members.toggle(this.currentData()._id); Filter.resetExceptions(); }, + 'click .js-toggle-custom-fields-filter'(evt) { + evt.preventDefault(); + Filter.customFields.toggle(this.currentData()._id); + Filter.resetExceptions(); + }, 'click .js-clear-all'(evt) { evt.preventDefault(); Filter.reset(); |