From 312991ca1e4403f4871c199f679ce332bee40661 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 27 Feb 2014 17:41:41 +0100
Subject: [PATCH] [FIX] ensure_db() on inherited /web/login controllers

bzr revid: fme@openerp.com-20140227164141-1sblr0g6ta66q1em
---
 addons/auth_oauth/controllers/main.py  | 3 ++-
 addons/auth_signup/controllers/main.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 7db9479ad13..b62fb31d8b0 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -9,7 +9,7 @@ import openerp
 from openerp import SUPERUSER_ID
 from openerp import http
 from openerp.http import request
-from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
+from openerp.addons.web.controllers.main import db_monodb, ensure_db, set_cookie_and_redirect, login_and_redirect
 from openerp.modules.registry import RegistryManager
 from openerp.tools.translate import _
 
@@ -72,6 +72,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
 
     @http.route()
     def web_login(self, *args, **kw):
+        ensure_db()
         providers = self.list_providers()
 
         response = super(OAuthLogin, self).web_login(*args, **kw)
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 54a13a0af87..78f2833f3d1 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -23,6 +23,7 @@ import werkzeug
 
 import openerp
 from openerp.addons.auth_signup.res_users import SignupError
+from openerp.addons.web.controllers.main import ensure_db
 from openerp import http
 from openerp.http import request
 from openerp.tools.translate import _
@@ -33,6 +34,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home):
 
     @http.route()
     def web_login(self, *args, **kw):
+        ensure_db()
         response = super(AuthSignupHome, self).web_login(*args, **kw)
         response.qcontext.update(self.get_auth_signup_config())
         return response