opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add user-friendly redirect links when requiring login.

Browse Source
This commit is contained in:
Nate Coraor
2008-11-24 12:44:31 -05:00
parent e27cf5804b
commit 7184560410
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/user.py
+8 -2
View File
@@ -102,7 +102,10 @@ class User( BaseController ):
else:
trans.handle_user_login( user )
trans.log_event( "User logged in" )
return trans.show_ok_message( "Now logged in as " + user.email, refresh_frames=refresh_frames )
msg = "Now logged in as " + user.email + "."
if trans.app.config.require_login:
msg += ' <a href="%s">Click here</a> to continue to the front page.' % web.url_for( '/static/welcome.html' )
return trans.show_ok_message( msg, refresh_frames=refresh_frames )
if trans.app.memory_usage:
m1 = trans.app.memory_usage.memory( m0, pretty=True )
log.info( "End of user/login, memory used increased by %s" % m1 )
@@ -133,7 +136,10 @@ class User( BaseController ):
if trans.app.memory_usage:
m1 = trans.app.memory_usage.memory( m0, pretty=True )
log.info( "End of user/logout, memory used increased by %s" % m1 )
return trans.show_ok_message( "You are no longer logged in.", refresh_frames=refresh_frames )
msg = "You are no longer logged in."
if trans.app.config.require_login:
msg += ' <a href="%s">Click here</a> to return to the login page.' % web.url_for( controller='user', action='login' )
return trans.show_ok_message( msg, refresh_frames=refresh_frames )
@web.expose
def create( self, trans, email='', password='', confirm='', subscribe=False ):