Sfoglia il codice sorgente

Merge branch 'nztqa-improve-comment-only' into devel

Fix: Slider for Comments only does not work correctly with over 21 activities.
Thanks to nztqa ! Closes #1269
Lauri Ojansivu 7 anni fa
parent
commit
1d3e2ffadd

+ 8 - 0
CHANGELOG.md

@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* [Fix: Slider for Comments only does not work correctly with over 21 activities](https://github.com/wekan/wekan/pull/1247).
+
+Thanks to Github user nztqa for contributions.
+
 # v0.45 2017-10-01 Wekan release
 
 This release adds the following new features:

+ 1 - 1
client/components/activities/activities.jade

@@ -90,7 +90,7 @@ template(name="boardActivities")
 
 template(name="cardActivities")
   each currentCard.activities
-    .activity.js-card-activity
+    .activity
       +userAvatar(userId=user._id)
       p.activity-desc
         +memberName(user=user)

+ 1 - 1
client/components/cards/cardDetails.jade

@@ -90,7 +90,7 @@ template(name="cardDetails")
       .material-toggle-switch
         span.toggle-switch-title {{_ 'hide-system-messages'}}
         if hiddenSystemMessages
-          input.toggle-switch(type="checkbox" id="toggleButton" checked="checked" disabled)
+          input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
         else
           input.toggle-switch(type="checkbox" id="toggleButton")
         label.toggle-label(for="toggleButton")

+ 1 - 2
client/components/cards/cardDetails.js

@@ -29,7 +29,6 @@ BlazeComponent.extendComponent({
   },
 
   hiddenSystemMessages() {
-    console.log('doo:', Meteor.user().hasHiddenSystemMessages());
     return Meteor.user().hasHiddenSystemMessages();
   },
 
@@ -105,7 +104,7 @@ BlazeComponent.extendComponent({
         this.parentComponent().mouseHasEnterCardDetails = true;
       },
       'click #toggleButton'() {
-        $('div.activity.js-card-activity:not(:has(.activity-comment))').toggle();
+        Meteor.call('toggleSystemMessages');
       },
     }];
   },

+ 0 - 2
client/components/lists/listBody.js

@@ -83,8 +83,6 @@ BlazeComponent.extendComponent({
       evt.stopImmediatePropagation();
       evt.preventDefault();
       Utils.goBoardId(Session.get('currentBoard'));
-    } else if (!Meteor.user().hasHiddenSystemMessages()) {
-      $('.toggle-switch').prop('checked', false);
     }
   },