Merge pull request #2086 from vinyldarkscratch/patch-5

Fix tools.py _get_login_settings()
2019-02-03 21:15:01 -08:00
parent 2fb3a78d75 3269e1a3f5
commit 0bf55f18d6
1 changed files with 2 additions and 2 deletions
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2260,9 +2260,9 @@ class Auth(AuthAPI):

    def _get_login_settings(self):
        table_user = self.table_user()
-        userfield = self.settings.login_userfield or 'username' \
+        userfield = self.settings.login_userfield or ('username' \
            if self.settings.login_userfield or 'username' \
-            in table_user.fields else 'email'
+            in table_user.fields else 'email')
        passfield = self.settings.password_field
        return Storage({'table_user': table_user,
                        'userfield': userfield,