summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDetails.jade
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-02-07 13:58:43 +0200
committerLauri Ojansivu <x@xet7.org>2020-02-07 13:58:43 +0200
commit2fce02afbced07c6ff2b05786f159701c8b559e9 (patch)
tree4c38417f5745725b4fe88b268bd0fbd102204c9d /client/components/cards/cardDetails.jade
parenta58e6be78d82af991884427fec953e891e3c779d (diff)
downloadwekan-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/cards/cardDetails.jade')
-rw-r--r--client/components/cards/cardDetails.jade17
1 files changed, 9 insertions, 8 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 7a6ca7cf..cb1f375e 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -261,14 +261,15 @@ template(name="cardDetails")
if currentUser.isBoardMember
unless currentUser.isNoComments
+commentForm
- unless currentUser.isNoComments
- if isLoaded.get
- if isLinkedCard
- +activities(card=this mode="linkedcard")
- else if isLinkedBoard
- +activities(card=this mode="linkedboard")
- else
- +activities(card=this mode="card")
+ if currentBoard.allowsActivities
+ unless currentUser.isNoComments
+ if isLoaded.get
+ if isLinkedCard
+ +activities(card=this mode="linkedcard")
+ else if isLinkedBoard
+ +activities(card=this mode="linkedboard")
+ else
+ +activities(card=this mode="card")
template(name="editCardTitleForm")
textarea.js-edit-card-title(rows='1' autofocus dir="auto")