Merge branch 'improve-activities' of https://github.com/nztqa/wekan into nztqa-improve-activities

1 files changed, 8 insertions, 0 deletions

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 587cd1bc..ecffe7aa 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -28,6 +28,11 @@ BlazeComponent.extendComponent({
     return card.findWatcher(Meteor.userId());
   },
 
+  hiddenSystemMessages() {
+    console.log('doo:', Meteor.user().hasHiddenSystemMessages());
+    return Meteor.user().hasHiddenSystemMessages();
+  },
+
   canModifyCard() {
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
@@ -99,6 +104,9 @@ BlazeComponent.extendComponent({
         this.parentComponent().showOverlay.set(true);
         this.parentComponent().mouseHasEnterCardDetails = true;
       },
+      'click #toggleButton'() {
+        $('div.activity.js-card-activity:not(:has(.activity-comment))').toggle();
+      },
     }];
   },
 }).register('cardDetails');