diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-12-02 23:30:10 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-12-02 23:30:10 +0200 |
| commit | 97158de70fff526b61cadf4c9819c74bd14c21d4 (patch) | |
| tree | 97c2085945da7fd966f747ef1268ac671caf2671 /models/users.js | |
| parent | 228996412c1324f4151c27ebbe172a94ce167eb9 (diff) | |
| parent | 926faf00318fc6a6d2ebe2f8bf2c96537751407c (diff) | |
| download | wekan-97158de70fff526b61cadf4c9819c74bd14c21d4.tar.gz wekan-97158de70fff526b61cadf4c9819c74bd14c21d4.tar.bz2 wekan-97158de70fff526b61cadf4c9819c74bd14c21d4.zip | |
Merge branch 'Akuket-devel' into edge
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; } |