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

fixed problem with logout redirect, thanks mbelletti

Browse Source
This commit is contained in:
Massimo Di Pierro committed 2012-02-09 11:11:24 -06:00
1 parent 3b6ebb054e
commit c6380e5601
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-02-09 10:59:05) stable Version 1.99.4 (2012-02-09 11:11:08) stable
gluon/tools.py
+6 -2
View File
@@ -1186,8 +1186,12 @@ class Auth(object):
next = '' next = ''
else: else:
next = '?_next='+urllib.quote(URL(args=request.args,vars=request.vars)) next = '?_next='+urllib.quote(URL(args=request.args,vars=request.vars))
li_next = '?_next='+urllib.quote(self.settings.login_next)
lo_next = '?_next='+urllib.quote(self.settings.logout_next)
if self.user_id: if self.user_id:
logout=A(T('Logout'),_href=action+'/logout'+next) logout=A(T('Logout'),_href=action+'/logout'+lo_next)
profile=A(T('Profile'),_href=action+'/profile'+next) profile=A(T('Profile'),_href=action+'/profile'+next)
password=A(T('Password'),_href=action+'/change_password'+next) password=A(T('Password'),_href=action+'/change_password'+next)
bar = SPAN(prefix,self.user.first_name,s1, logout,s3,_class='auth_navbar') bar = SPAN(prefix,self.user.first_name,s1, logout,s3,_class='auth_navbar')
@@ -1198,7 +1202,7 @@ class Auth(object):
bar.insert(-1, s2) bar.insert(-1, s2)
bar.insert(-1, password) bar.insert(-1, password)
else: else:
login=A(T('Login'),_href=action+'/login'+next) login=A(T('Login'),_href=action+'/login'+li_next)
register=A(T('Register'),_href=action+'/register'+next) register=A(T('Register'),_href=action+'/register'+next)
retrieve_username=A(T('forgot username?'), retrieve_username=A(T('forgot username?'),
_href=action+'/retrieve_username'+next) _href=action+'/retrieve_username'+next)