From c5d7340e9bc45c620118b29a1105081169e46b2a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 28 Jan 2014 19:11:56 +0100
Subject: [PATCH] [FIX] auth_oauth: do not shadow non-oauth errors

bzr revid: chs@openerp.com-20140128181156-489gcdkiq0yaopda
---
 addons/auth_oauth/controllers/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 0e4d5572c52..a4b474f1f09 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -83,10 +83,10 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
                 error = _("You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email.")
             else:
                 error = None
-            response.params['values'].update(
-                providers=providers,
-                error=error,
-            )
+
+            response.params['values']['providers'] = providers
+            if error:
+                response.params['values']['error'] = error
 
         return response