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
This commit is contained in:
Lauri Ojansivu 2017-10-03 14:01:47 +03:00
commit 1d3e2ffadd
5 changed files with 11 additions and 6 deletions

View file

@ -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:

View file

@ -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)

View file

@ -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")

View file

@ -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');
},
}];
},

View file

@ -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);
}
},