diff options
author | IgnatzHome <ignatz@maschath.de> | 2018-06-14 19:42:09 +0200 |
---|---|---|
committer | IgnatzHome <ignatz@maschath.de> | 2018-06-14 19:42:09 +0200 |
commit | a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e (patch) | |
tree | 6e30c7ebc0106518ec5ea76bcb57d294cc9f48f1 /client/components/sidebar | |
parent | 991e74bfc287d840951b7c707b7ff2a2f26e5001 (diff) | |
parent | fcf262cc9807c1e87e638ce6b0c6151ae2114f60 (diff) | |
download | wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.tar.gz wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.tar.bz2 wekan-a433f7d9fe310e1aa5f5c831b2bfacb5b86c941e.zip |
Merge branch 'feature-custom-fields' of https://github.com/feuerball11/wekan into feature-custom-fields
Diffstat (limited to 'client/components/sidebar')
-rw-r--r-- | client/components/sidebar/sidebarCustomFields.jade | 4 | ||||
-rw-r--r-- | client/components/sidebar/sidebarFilters.jade | 19 | ||||
-rw-r--r-- | client/components/sidebar/sidebarFilters.js | 10 |
3 files changed, 31 insertions, 2 deletions
diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index def083e9..fd31e5ac 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -37,7 +37,7 @@ template(name="createCustomFieldPopup") each dropdownItems.get input.js-dropdown-item(type="text" value=name placeholder="") input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}") - a.flex.js-field-show-on-card + a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}") .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") span {{_ 'show-field-on-card'}} @@ -49,4 +49,4 @@ template(name="createCustomFieldPopup") template(name="deleteCustomFieldPopup") p {{_ "custom-field-delete-pop"}} - button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
\ No newline at end of file + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 273df8c2..514870b8 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -40,6 +40,25 @@ 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 + hr + span {{_ 'advanced-filter-label'}} + input.js-field-advanced-filter(type="text") + span {{_ 'advanced-filter-description'}} 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..fd8229e4 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -11,6 +11,16 @@ 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(); + }, + 'change .js-field-advanced-filter'(evt) { + evt.preventDefault(); + Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim()); + Filter.resetExceptions(); + }, 'click .js-clear-all'(evt) { evt.preventDefault(); Filter.reset(); |