From cdd3f6ed008eafba238b3b14aa9412bd45c6498a Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 6 May 2013 22:49:04 -0500 Subject: [PATCH] allow arbitrary username to enable register and sign in with facebook, thanks Ting-Yu Chou --- VERSION | 2 +- gluon/tools.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c16745af..1e691388 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.06.19.49.05 +Version 2.4.6-stable+timestamp.2013.05.06.22.48.04 diff --git a/gluon/tools.py b/gluon/tools.py index 73f02ef2..0e4ce10e 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2249,7 +2249,9 @@ class Auth(object): log = self.messages.register_log table_user = self.table_user() - if 'username' in table_user.fields: + if self.settings.login_userfield: + username = self.settings.login_userfield + elif 'username' in table_user.fields: username = 'username' else: username = 'email'