diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-10-11 22:47:11 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-10-11 22:47:11 +0300 |
| commit | b4402b72ac8beb93528b789d3d319d44dd483f29 (patch) | |
| tree | ace57f5bf6d12522548a5bbc8813c00d91af6121 /models | |
| parent | 6742dd05853352d68fdfbad1eec71365b4e53732 (diff) | |
| parent | 23a35d9707f82391c74afbfbe47173815646e589 (diff) | |
| download | wekan-b4402b72ac8beb93528b789d3d319d44dd483f29.tar.gz wekan-b4402b72ac8beb93528b789d3d319d44dd483f29.tar.bz2 wekan-b4402b72ac8beb93528b789d3d319d44dd483f29.zip | |
Merge branch 'edge' of https://github.com/Akuket/wekan into Akuket-edge
Diffstat (limited to 'models')
| -rw-r--r-- | models/activities.js | 11 | ||||
| -rw-r--r-- | models/settings.js | 1 | ||||
| -rw-r--r-- | models/users.js | 4 |
3 files changed, 1 insertions, 15 deletions
diff --git a/models/activities.js b/models/activities.js index c3c8f173..aad5d412 100644 --- a/models/activities.js +++ b/models/activities.js @@ -152,17 +152,6 @@ if (Meteor.isServer) { if (board) { const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId'); const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId'); - const mutedUsers = _.pluck(_.where(board.watchers, {level: 'muted'}), 'userId'); - switch(board.getWatchDefault()) { - case 'muted': - participants = _.intersection(participants, trackingUsers); - watchers = _.intersection(watchers, trackingUsers); - break; - case 'tracking': - participants = _.difference(participants, mutedUsers); - watchers = _.difference(watchers, mutedUsers); - break; - } watchers = _.union(watchers, watchingUsers || []); } diff --git a/models/settings.js b/models/settings.js index bb555cf9..2f82e52f 100644 --- a/models/settings.js +++ b/models/settings.js @@ -116,6 +116,7 @@ if (Meteor.isServer) { url: FlowRouter.url('sign-up'), }; const lang = author.getLanguage(); + Email.send({ to: icode.email, from: Accounts.emailTemplates.from, diff --git a/models/users.js b/models/users.js index f8ccb030..4f2184e4 100644 --- a/models/users.js +++ b/models/users.js @@ -89,10 +89,6 @@ Users.attachSchema(new SimpleSchema({ type: [String], optional: true, }, - 'profile.tags': { - type: [String], - optional: true, - }, 'profile.icode': { type: String, optional: true, |