[MERGE] upstream

bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj

1 files changed, 5 insertions, 5 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 2672d95ccde..bb3517ed707 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 _
@@ -25,7 +25,7 @@ def fragment_to_query_string(func):
             return """<html><head><script>
                 var l = window.location;
                 var q = l.hash.substring(1);
-                var r = '/' + l.search;
+                var r = l.pathname + l.search;
                 if(q.length !== 0) {
                     var s = l.search ? (l.search === '?' ? '' : '&') : '?';
                     r = l.pathname + l.search + s + q;
@@ -75,7 +75,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.")
@@ -86,9 +86,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