[IMP] oaut & signup, redirect if already logged in
bzr revid: fme@openerp.com-20140312112141-uvo89w4ovmzq5ozq
This commit is contained in:
parent
9684f07735
commit
2ed053642a
|
@ -68,6 +68,9 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
|
||||||
|
|
||||||
@http.route()
|
@http.route()
|
||||||
def web_login(self, *args, **kw):
|
def web_login(self, *args, **kw):
|
||||||
|
if request.httprequest.method == 'GET' and request.session.uid and request.params.get('redirect'):
|
||||||
|
# Redirect if already logged in and redirect param is present
|
||||||
|
return http.redirect_with_hash(request.params.get('redirect'))
|
||||||
providers = self.list_providers()
|
providers = self.list_providers()
|
||||||
|
|
||||||
response = super(OAuthLogin, self).web_login(*args, **kw)
|
response = super(OAuthLogin, self).web_login(*args, **kw)
|
||||||
|
|
|
@ -37,6 +37,9 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
|
||||||
mode = request.params.get('mode')
|
mode = request.params.get('mode')
|
||||||
qcontext = request.params.copy()
|
qcontext = request.params.copy()
|
||||||
super_response = None
|
super_response = None
|
||||||
|
if request.httprequest.method == 'GET' and request.session.uid and request.params.get('redirect'):
|
||||||
|
# Redirect if already logged in and redirect param is present
|
||||||
|
return http.redirect_with_hash(request.params.get('redirect'))
|
||||||
if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'):
|
if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'):
|
||||||
# Default behavior is to try to login, which in reset or signup mode in a non-sense.
|
# Default behavior is to try to login, which in reset or signup mode in a non-sense.
|
||||||
super_response = super(AuthSignup, self).web_login(*args, **kw)
|
super_response = super(AuthSignup, self).web_login(*args, **kw)
|
||||||
|
|
Loading…
Reference in New Issue