summaryrefslogtreecommitdiff
path: root/addons/auth_oauth/controllers/main.py
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-02-26 17:45:51 +0100
committerFabien Meghazi <fme@openerp.com>2014-02-26 17:45:51 +0100
commit3324351bf60d83d91f3ee8495653ca4b1b74a60f (patch)
treeaa61b35320974bcae2e72a6a4b76ed044bef1bde /addons/auth_oauth/controllers/main.py
parent71537320c5aa47ac38e00aa68a79fcaf9bdeff99 (diff)
parent35a7182893f3f46204b252d9fedf746902f9bba5 (diff)
[IMP] Improvement/changes to the http request/response API.
- Get rid of LazyResponses - Made website.render() an alias to request.render() [just kept in case this is merged in saas-3 but should be removed completely in favor of request.render()] Need server/trunk's rev#5102 bzr revid: fme@openerp.com-20140226164551-d42a3g057grr722y
Diffstat (limited to 'addons/auth_oauth/controllers/main.py')
-rw-r--r--addons/auth_oauth/controllers/main.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 53a6ffd5462..5a22240abac 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -8,7 +8,7 @@ from werkzeug.exceptions import BadRequest
import openerp
from openerp import SUPERUSER_ID
from openerp import http
-from openerp.http import request, LazyResponse
+from openerp.http import request
from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
from openerp.modules.registry import RegistryManager
from openerp.tools.translate import _
@@ -71,7 +71,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
providers = self.list_providers()
response = super(OAuthLogin, self).web_login(*args, **kw)
- if isinstance(response, LazyResponse):
+ if response.is_qweb:
error = request.params.get('oauth_error')
if error == '1':
error = _("Sign up is not allowed on this database.")
@@ -82,9 +82,9 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
else:
error = None
- response.params['values']['providers'] = providers
+ response.qcontext['providers'] = providers
if error:
- response.params['values']['error'] = error
+ response.qcontext['error'] = error
return response