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

Fixes request_reset_password w/ custom userfield

Browse Source
This commit is contained in:
Mirko Galimberti
2018-09-06 14:58:03 +02:00
parent 33c6dd9656
commit 55a2f4a6b2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+5 -4
View File
@@ -3447,7 +3447,8 @@ class Auth(AuthAPI):
if log is DEFAULT: if log is DEFAULT:
log = self.messages['reset_password_log'] log = self.messages['reset_password_log']
userfield = self.settings.login_userfield or 'username' \ userfield = self.settings.login_userfield or 'username' \
if 'username' in table_user.fields else 'email' if self.settings.login_userfield or 'username' \
in table_user.fields else 'email'
if userfield == 'email': if userfield == 'email':
table_user.email.requires = [ table_user.email.requires = [
IS_EMAIL(error_message=self.messages.invalid_email), IS_EMAIL(error_message=self.messages.invalid_email),
@@ -3456,11 +3457,11 @@ class Auth(AuthAPI):
if not self.settings.email_case_sensitive: if not self.settings.email_case_sensitive:
table_user.email.requires.insert(0, IS_LOWER()) table_user.email.requires.insert(0, IS_LOWER())
else: else:
table_user.username.requires = [ table_user[userfield].requires = [
IS_IN_DB(self.db, table_user.username, IS_IN_DB(self.db, table_user[userfield],
error_message=self.messages.invalid_username)] error_message=self.messages.invalid_username)]
if not self.settings.username_case_sensitive: if not self.settings.username_case_sensitive:
table_user.username.requires.insert(0, IS_LOWER()) table_user[userfield].requires.insert(0, IS_LOWER())
form = SQLFORM(table_user, form = SQLFORM(table_user,
fields=[userfield], fields=[userfield],