diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
commit | 7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f (patch) | |
tree | 5715424ab1454463a3f8ca458729347bbc014f5b /server | |
parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
parent | 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 (diff) | |
download | wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.gz wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.bz2 wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.zip |
Fix merge conflict.
Diffstat (limited to 'server')
-rw-r--r-- | server/publications/settings.js | 13 | ||||
-rw-r--r-- | server/publications/users.js | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/server/publications/settings.js b/server/publications/settings.js new file mode 100644 index 00000000..c2d9fdff --- /dev/null +++ b/server/publications/settings.js @@ -0,0 +1,13 @@ +Meteor.publish('setting', () => { + return Settings.find({}, {fields:{disableRegistration: 1}}); +}); + +Meteor.publish('mailServer', function () { + if (!Match.test(this.userId, String)) + return []; + const user = Users.findOne(this.userId); + if(user && user.isAdmin){ + return Settings.find({}, {fields: {mailServer: 1}}); + } + return []; +}); diff --git a/server/publications/users.js b/server/publications/users.js index 4321e32b..4fd98e13 100644 --- a/server/publications/users.js +++ b/server/publications/users.js @@ -9,3 +9,11 @@ Meteor.publish('user-miniprofile', function(userId) { }, }); }); + +Meteor.publish('user-admin', function() { + return Meteor.users.find(this.userId, { + fields: { + isAdmin: 1, + }, + }); +}); |