From deef0855d5420c7fa30c138d68cdae8b8f5c690d Mon Sep 17 00:00:00 2001 From: soohwa Date: Mon, 25 Sep 2017 21:03:18 +0900 Subject: Fix https://github.com/wekan/wekan/issues/1249 --- models/users.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/models/users.js b/models/users.js index c2238cde..43faf4d4 100644 --- a/models/users.js +++ b/models/users.js @@ -108,6 +108,10 @@ Users.attachSchema(new SimpleSchema({ type: Boolean, optional: true, }, + fromAdmin: { + type: Boolean, + optional: true, + }, })); // Search a user in the complete server database by its name or username. This @@ -435,6 +439,12 @@ if (Meteor.isServer) { user.isAdmin = true; return user; } + + if (options.from == 'admin') { + user.fromAdmin = true; + return user; + } + const disableRegistration = Settings.findOne().disableRegistration; if (!disableRegistration) { return user; @@ -524,6 +534,9 @@ if (Meteor.isServer) { Users.after.insert((userId, doc) => { + if (doc.fromAdmin) + return; + //invite user to corresponding boards const disableRegistration = Settings.findOne().disableRegistration; if (disableRegistration) { @@ -582,6 +595,7 @@ if (Meteor.isServer) { username: req.body.username, email: req.body.email, password: 'default', + from: 'admin' }); JsonRoutes.sendResult(res, { -- cgit v1.2.3-1-g7c22