diff options
| author | Jessica Tallon <tsyesika@tsyesika.se> | 2015-07-17 17:51:51 +0200 |
|---|---|---|
| committer | Jessica Tallon <tsyesika@tsyesika.se> | 2015-07-31 15:15:24 +0200 |
| commit | d88fcb03e2e520da6a7d0203d660e4536108f56b (patch) | |
| tree | 75b751fae15a037301bb384e64eba13746cb57a6 /mediagoblin/plugins/ldap | |
| parent | 283e6d8b9f09341e3b97418b79f389bfdfee6498 (diff) | |
| download | mediagoblin-d88fcb03e2e520da6a7d0203d660e4536108f56b.tar.lz mediagoblin-d88fcb03e2e520da6a7d0203d660e4536108f56b.tar.xz mediagoblin-d88fcb03e2e520da6a7d0203d660e4536108f56b.zip | |
Change codebase to query or create correct User model
The code base had many references to User.username and other
specific to LocalUser attributes as that was the way it use to exist.
This updates those to query on the generic User model but filtering
by attributes on the LocalUser.
Diffstat (limited to 'mediagoblin/plugins/ldap')
| -rw-r--r-- | mediagoblin/plugins/ldap/views.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py index be434daf..71904d1f 100644 --- a/mediagoblin/plugins/ldap/views.py +++ b/mediagoblin/plugins/ldap/views.py @@ -18,7 +18,7 @@ import six from mediagoblin import mg_globals, messages from mediagoblin.auth.tools import register_user -from mediagoblin.db.models import User +from mediagoblin.db.models import User, LocalUser from mediagoblin.decorators import allow_registration, auth_enabled from mediagoblin.plugins.ldap import forms from mediagoblin.plugins.ldap.tools import LDAP @@ -38,8 +38,9 @@ def login(request): login_form.password.data) if username: - user = User.query.filter_by( - username=username).first() + user = User.query.filter( + LocalUser.username==username + ).first() if user: # set up login in session |