diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-02-07 13:58:43 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-02-07 13:58:43 +0200 |
commit | 2fce02afbced07c6ff2b05786f159701c8b559e9 (patch) | |
tree | 4c38417f5745725b4fe88b268bd0fbd102204c9d /client/components/sidebar | |
parent | a58e6be78d82af991884427fec953e891e3c779d (diff) | |
download | wekan-2fce02afbced07c6ff2b05786f159701c8b559e9.tar.gz wekan-2fce02afbced07c6ff2b05786f159701c8b559e9.tar.bz2 wekan-2fce02afbced07c6ff2b05786f159701c8b559e9.zip |
Add Feature: Card Settings/Show on card/Activities.
Fix: When in Card Settings hiding Comments, only adding new comment is hidden, not old comments.
Thanks to xet7 !
Closes #2925
Diffstat (limited to 'client/components/sidebar')
-rw-r--r-- | client/components/sidebar/sidebar.jade | 6 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index 51b09d72..ae52dc4c 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -153,6 +153,12 @@ template(name="boardCardSettingsPopup") span i.fa.fa-comment-o | {{_ 'comment'}} + div.check-div + a.flex.js-field-has-comments(class="{{#if allowsActivities}}is-checked{{/if}}") + .materialCheckBox(class="{{#if allowsActivities}}is-checked{{/if}}") + span + i.fa.fa-history + | {{_ 'activities'}} template(name="boardSubtaskSettingsPopup") form.board-subtask-settings diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 4de7aa80..c3c00b08 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -882,6 +882,22 @@ BlazeComponent.extendComponent({ this.currentBoard.allowsComments, ); }, + 'click .js-field-has-activities'(evt) { + evt.preventDefault(); + this.currentBoard.allowsActivities = !this.currentBoard + .allowsActivities; + this.currentBoard.setAllowsActivities( + this.currentBoard.allowsActivities, + ); + $(`.js-field-has-activities ${MCB}`).toggleClass( + CKCLS, + this.currentBoard.allowsActivities, + ); + $('.js-field-has-activities').toggleClass( + CKCLS, + this.currentBoard.allowsActivities, + ); + }, }, ]; }, |