dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1376 from niphlod/fix/1354

Browse Source 
fixes #1354
This commit is contained in:
mdipierro
2016-07-01 01:56:21 -05:00
committed by GitHub
parent 5a5c2b500a 4966466509
commit 5d13e56dc5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/ldap_auth.py
+1 -1
View File
@@ -532,7 +532,7 @@ def ldap_auth(server='ldap',
'There is no username or email for %s!' % username) 'There is no username or email for %s!' % username)
raise raise
# if old pydal version, assume this is a relational database which can do joins # if old pydal version, assume this is a relational database which can do joins
db_can_join = db.can_join() if hasattr(db, 'can_join') else True db_can_join = db.can_join() if hasattr(db._adapter, 'can_join') else True
if db_can_join: if db_can_join:
db_group_search = \ db_group_search = \
db((db.auth_membership.user_id == db_user_id) & db((db.auth_membership.user_id == db_user_id) &