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

fixing missing use_username issue, thanks Annet

Browse Source
This commit is contained in:
mdipierro
2012-08-30 15:01:22 -05:00
parent ec92b8fff1
commit 10555af3e6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.2 (2012-08-30 14:54:37) stable Version 2.0.2 (2012-08-30 15:01:19) stable
gluon/tools.py
+4
View File
@@ -1060,6 +1060,7 @@ class Auth(object):
request = current.request request = current.request
session = current.session session = current.session
auth = session.auth auth = session.auth
self.use_username = None # None means postpone detection
self.user_groups = auth and auth.user_groups or {} self.user_groups = auth and auth.user_groups or {}
if auth and auth.last_visit and auth.last_visit + \ if auth and auth.last_visit and auth.last_visit + \
datetime.timedelta(days=0, seconds=auth.expiration) > request.now: datetime.timedelta(days=0, seconds=auth.expiration) > request.now:
@@ -1257,6 +1258,9 @@ class Auth(object):
if not 'register' in self.settings.actions_disabled: if not 'register' in self.settings.actions_disabled:
bar.insert(-1, s2) bar.insert(-1, s2)
bar.insert(-1, register) bar.insert(-1, register)
if self.use_username is None:
# should always be false if auth.define_tables() is called
self.use_username = 'username' in self.table_user().fields
if self.use_username and \ if self.use_username and \
not 'retrieve_username' in self.settings.actions_disabled: not 'retrieve_username' in self.settings.actions_disabled:
bar.insert(-1, s2) bar.insert(-1, s2)