vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

setup profile before calling on login post session

Browse source
This commit is contained in:
Anand Doshi 2012-04-27 15:28:45 +05:30
parent b69063d406
commit 36e21f79e5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
py/webnotes/auth.py
View file

@ -62,12 +62,12 @@ class HTTPRequest:
webnotes.msgprint(webnotes.conn.get_global("__session_status_message"))
raise webnotes.SessionStopped('Session Stopped')
# load profile
self.setup_profile()
# run login triggers
if webnotes.form_dict.get('cmd')=='login':
webnotes.login_manager.run_trigger('on_login_post_session')
# load profile
self.setup_profile()
# write out cookies
webnotes.cookie_manager.set_cookies()
@ -81,11 +81,12 @@ class HTTPRequest:
def setup_profile(self):
webnotes.user = webnotes.profile.Profile()
# load the profile data
if webnotes.session['data'].get('profile'):
webnotes.user.load_from_session(webnotes.session['data']['profile'])
else:
webnotes.user.load_profile()
if not webnotes.session['data'].get('profile'):
webnotes.session['data']['profile'] = webnotes.user.load_profile()
webnotes.user.load_from_session(webnotes.session['data']['profile'])
# set database login
# ------------------