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

fixed issue 1260, auth.settings.update_fields, thanks Nafiux

Browse Source
This commit is contained in:
Massimo
2013-01-08 15:23:44 -06:00
parent 2d606e6836
commit 4946ebf154
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.08.14.36.21 Version 2.4.1-alpha.2+timestamp.2013.01.08.15.22.56
gluon/tools.py
+7 -3
View File
@@ -881,6 +881,7 @@ class Auth(object):
profile_fields=None, profile_fields=None,
email_case_sensitive=True, email_case_sensitive=True,
username_case_sensitive=True, username_case_sensitive=True,
update_fields = ['email'],
) )
# ## these are messages that can be customized # ## these are messages that can be customized
default_messages = dict( default_messages = dict(
@@ -2047,7 +2048,8 @@ class Auth(object):
if not self in self.settings.login_methods: if not self in self.settings.login_methods:
# do not store password in db # do not store password in db
form.vars[passfield] = None form.vars[passfield] = None
user = self.get_or_create_user(form.vars) user = self.get_or_create_user(
form.vars, self.settings.update_fields)
break break
if not user: if not user:
# alternates have failed, maybe because service inaccessible # alternates have failed, maybe because service inaccessible
@@ -2067,7 +2069,8 @@ class Auth(object):
if not self in self.settings.login_methods: if not self in self.settings.login_methods:
# do not store password in db # do not store password in db
form.vars[passfield] = None form.vars[passfield] = None
user = self.get_or_create_user(form.vars) user = self.get_or_create_user(
form.vars, self.settings.update_fields)
break break
if not user: if not user:
self.log_event(self.messages.login_failed_log, self.log_event(self.messages.login_failed_log,
@@ -2087,7 +2090,8 @@ class Auth(object):
if cas_user: if cas_user:
cas_user[passfield] = None cas_user[passfield] = None
user = self.get_or_create_user( user = self.get_or_create_user(
table_user._filter_fields(cas_user)) table_user._filter_fields(cas_user),
self.settings.update_fields)
elif hasattr(cas, 'login_form'): elif hasattr(cas, 'login_form'):
return cas.login_form() return cas.login_form()
else: else: