summaryrefslogtreecommitdiffstats
path: root/client/components/activities/activities.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2016-11-20 23:31:50 +0200
committerGitHub <noreply@github.com>2016-11-20 23:31:50 +0200
commit1ad41072010fb59fdbace80a0aa049634074dac1 (patch)
treef3c444b06c6b38d80028d524d6e041c8a48de40e /client/components/activities/activities.js
parent693f615136319e0e6da370294270272691713f94 (diff)
parent4359f66ecee8003f0fa625fd5e293ba38cc133e3 (diff)
downloadwekan-1ad41072010fb59fdbace80a0aa049634074dac1.tar.gz
wekan-1ad41072010fb59fdbace80a0aa049634074dac1.tar.bz2
wekan-1ad41072010fb59fdbace80a0aa049634074dac1.zip
Merge pull request #19 from mario-orlicky/hide-system-messages
New change settings option and possibility to hide system messagaes
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r--client/components/activities/activities.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 0bd6a272..6600849c 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -12,10 +12,12 @@ BlazeComponent.extendComponent({
const capitalizedMode = Utils.capitalize(mode);
const id = Session.get(`current${capitalizedMode}`);
const limit = this.page.get() * activitiesPerPage;
+ const user = Meteor.user();
+ const hideSystem = user ? user.hasHiddenSystemMessages() : false;
if (id === null)
return;
- this.subscribe('activities', mode, id, limit, () => {
+ this.subscribe('activities', mode, id, limit, hideSystem, () => {
this.loadNextPageLocked = false;
// If the sibear peak hasn't increased, that mean that there are no more