summaryrefslogtreecommitdiffstats
path: root/client/components/activities
diff options
context:
space:
mode:
authorBéranger Campardou <b.campardou@gmail.com>2017-01-13 11:16:37 +0100
committerBéranger Campardou <b.campardou@gmail.com>2017-01-13 11:16:37 +0100
commitf7f5f4a35d1fc9e3d559dcf413f3f221937f07f8 (patch)
tree7915cb31bfd2328f219b6f88f6c86fcb4da7a920 /client/components/activities
parent5eda2c80f8de3f0b025f5233613cdbb409a73e94 (diff)
parenta7aa7e931825c7ce133fc19588cb6550af8543d7 (diff)
downloadwekan-f7f5f4a35d1fc9e3d559dcf413f3f221937f07f8.tar.gz
wekan-f7f5f4a35d1fc9e3d559dcf413f3f221937f07f8.tar.bz2
wekan-f7f5f4a35d1fc9e3d559dcf413f3f221937f07f8.zip
merge wefork
Diffstat (limited to 'client/components/activities')
-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