diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-11-17 14:51:22 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-11-17 14:51:22 +0200 |
commit | b8b1512e266a24d7e7e13cd70dd116b5ba35afee (patch) | |
tree | 6eceac9c10576d9324beba89cf8d19bf48d4511a /models/users.js | |
parent | 3300c69a039b3a4aa54c21340104a231cf2e80b1 (diff) | |
parent | 960b33c3d91f2d3c943b8d889292ac4e7407ddcd (diff) | |
download | wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.tar.gz wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.tar.bz2 wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'models/users.js')
-rw-r--r-- | models/users.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/users.js b/models/users.js index 630f4703..2e879d94 100644 --- a/models/users.js +++ b/models/users.js @@ -520,10 +520,10 @@ if (Meteor.isServer) { } const disableRegistration = Settings.findOne().disableRegistration; - // If ldap, bypass the inviation code if the self registration isn't allowed. - // TODO : pay attention if ldap field in the user model change to another content ex : ldap field to connection_type - if (options.ldap || !disableRegistration) { - user.authenticationMethod = 'ldap'; + if (!disableRegistration) { + if (options.ldap) { + user.authenticationMethod = 'ldap'; + } return user; } |