From 87d48b0859c1cbd6a98fca2dfc97fae0e838055f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 9 Jun 2015 12:40:10 +0200
Subject: [PATCH] [FIX] web: do not crash when select wrong db

When a user tries to log into a postgresql database with no view web.login (this
happens if the database is not an odoo database or using a previous version of
odoo), the rendering failed, producing a 500 error (with no detail for the user)
Instead, redirect to the database selector with an informative message.
Fixes #3443

The database selector page is a jinja template with no access to database
required so should be able to be displayed on any database.

Future improvement could verify the version of base module for even more precise
verification before login (but need to make sure it's always accurate).
---
 addons/web/controllers/main.py          | 9 ++++++++-
 addons/web/views/database_selector.html | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 8b3a21fdee8..340b57da5f1 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -511,7 +511,13 @@ class Home(http.Controller):
                 return http.redirect_with_hash(redirect)
             request.uid = old_uid
             values['error'] = "Wrong login/password"
-        return request.render('web.login', values)
+        if request.env.ref('web.login', False):
+            return request.render('web.login', values)
+        else:
+            # probably not an odoo compatible database
+            error = 'Unable to login on database %s' % request.session.db
+            return werkzeug.utils.redirect('/web/database/selector?error=%s' % error, 303)
+
 
     @http.route('/login', type='http', auth="none")
     def login(self, db, login, key, redirect="/web", **kw):
@@ -664,6 +670,7 @@ class Database(http.Controller):
         return env.get_template("database_selector.html").render({
             'databases': dbs,
             'debug': request.debug,
+            'error': kw.get('error')
         })
 
     @http.route('/web/database/manager', type='http', auth="none")
diff --git a/addons/web/views/database_selector.html b/addons/web/views/database_selector.html
index 67c82c6c260..993cc4b3f99 100644
--- a/addons/web/views/database_selector.html
+++ b/addons/web/views/database_selector.html
@@ -24,6 +24,12 @@
 
             <hr/>
 
+            {% if error %}
+                <p class="alert alert-danger">
+                    {{ error }}
+                </p>
+            {% endif %}
+
             <div class="form-group field-db">
                 <label for="db" class="control-label">Select database</label>
                 {% if databases %}