diff options
| author | Andrés Manelli <andresmanelli@gmail.com> | 2018-08-15 22:17:52 +0200 |
|---|---|---|
| committer | Andrés Manelli <andresmanelli@gmail.com> | 2018-08-15 22:17:52 +0200 |
| commit | be00465e67931f2a5655ed47f6e075ed1c589f54 (patch) | |
| tree | ffdec2ffca3d29643793673d62059f3f2a43a5ef /client | |
| parent | e55d7e4f72a4b425c4aca5ba04a7be1fc642649b (diff) | |
| download | wekan-be00465e67931f2a5655ed47f6e075ed1c589f54.tar.gz wekan-be00465e67931f2a5655ed47f6e075ed1c589f54.tar.bz2 wekan-be00465e67931f2a5655ed47f6e075ed1c589f54.zip | |
Fix hiddenSystemMessages
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/activities/activities.js | 16 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.jade | 7 |
2 files changed, 18 insertions, 5 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 95699961..25e151fd 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -8,16 +8,24 @@ BlazeComponent.extendComponent({ const sidebar = this.parentComponent(); // XXX for some reason not working sidebar.callFirstWith(null, 'resetNextPeak'); this.autorun(() => { - const mode = this.data().mode; + let mode = this.data().mode; const capitalizedMode = Utils.capitalize(mode); - const id = Session.get(`current${capitalizedMode}`); + let thisId, searchId; + if (mode === 'linkedcard' || mode === 'linkedboard') { + thisId = Session.get('currentCard'); + searchId = Cards.findOne({_id: thisId}).linkedId; + mode = mode.replace('linked', ''); + } else { + thisId = Session.get(`current${capitalizedMode}`); + searchId = thisId; + } const limit = this.page.get() * activitiesPerPage; const user = Meteor.user(); const hideSystem = user ? user.hasHiddenSystemMessages() : false; - if (id === null) + if (searchId === null) return; - this.subscribe('activities', mode, id, limit, hideSystem, () => { + this.subscribe('activities', mode, searchId, limit, hideSystem, () => { this.loadNextPageLocked = false; // If the sibear peak hasn't increased, that mean that there are no more diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ac7218d4..ad2044e8 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -182,7 +182,12 @@ template(name="cardDetails") if currentUser.isBoardMember +commentForm if isLoaded.get - +activities(card=this mode="card") + 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) |