Merge lp:~openerp-dev/openerp-web/7.0-monodb-again-fme into lp:openerp-web/7.0

[Christophe Simonis (OpenERP)]

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Why?

review: Needs Information

Unmerged revisions

3853. By Fabien Meghazi (OpenERP) on 2013-03-20

[IMP] Hard code instance._selected_db in template

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-04-05 13:47:47 +0000
+++ addons/web/controllers/main.py	2013-04-16 09:52:29 +0000
@@ -93,14 +93,8 @@
     dbs = [i for i in dbs if re.match(r, i)]
     return dbs
 
-def db_monodb_redirect(req):
+def db_monodb(req):
     db = False
-    redirect = False
-
-    # 1 try the db in the url
-    db_url = req.params.get('db')
-    if db_url:
-        return (db_url, False)
 
     try:
         dbs = db_list(req)
@@ -108,25 +102,18 @@
         # ignore access denied
         dbs = []
 
-    # 2 use the database from the cookie if it's listable and still listed
-    cookie_db = req.httprequest.cookies.get('last_used_database')
-    if cookie_db in dbs:
-        db = cookie_db
-
-    # 3 use the first db
-    if dbs and not db:
+    # 1 try the db in the url
+    db = req.params.get('db')
+
+    # 2 try the db in the cookie
+    if not db:
+        db = req.httprequest.cookies.get('last_used_database')
+
+    # 3 use the first db, ensure db is listed
+    if dbs and db not in dbs:
         db = dbs[0]
 
-    # redirect to the chosen db if multiple are available
-    if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(req.httprequest.query_string, keep_blank_values=True))
-        query.update({ 'db': db })
-        redirect = req.httprequest.path + '?' + urllib.urlencode(query)
-    return (db, redirect)
-
-def db_monodb(req):
-    # if only one db exists, return it else return False
-    return db_monodb_redirect(req)[0]
+    return db
 
 def redirect_with_hash(req, url, code=303):
     if req.httprequest.user_agent.browser == 'msie':
@@ -551,6 +538,7 @@
         <script type="text/javascript">
             $(function() {
                 var s = new openerp.init(%(modules)s);
+                s._selected_db = %(db)s;
                 %(init)s
             });
         </script>
@@ -569,14 +557,11 @@
 
     @openerpweb.httprequest
     def index(self, req, s_action=None, db=None, **kw):
-        db, redir = db_monodb_redirect(req)
-        if redir:
-            return redirect_with_hash(req, redir)
-
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, 'js', db=db))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, 'css', db=db))
 
         r = html_template % {
+            'db': simplejson.dumps(db_monodb(req)),
             'js': js,
             'css': css,
             'modules': simplejson.dumps(module_boot(req, db=db)),

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-03-19 15:43:45 +0000
+++ addons/web/static/src/js/chrome.js	2013-04-16 09:52:29 +0000
@@ -603,7 +603,7 @@
         this._super(parent);
         this.has_local_storage = typeof(localStorage) != 'undefined';
         this.db_list = null;
-        this.selected_db = null;
+        this.selected_db = instance._selected_db;
         this.selected_login = null;
         this.params = action.params || {};
         if (_.isEmpty(this.params)) {
@@ -614,9 +614,6 @@
         } else if ($.deparam.querystring().db) {
             this.params.db = $.deparam.querystring().db;
         }
-        if (this.params.db) {
-            this.selected_db = this.params.db;
-        }
 
         if (this.params.login_successful) {
             this.on('login_successful', this, this.params.login_successful);
@@ -674,9 +671,6 @@
     on_db_loaded: function (result) {
         var self = this;
         this.db_list = result;
-        if (!this.selected_db) {
-            this.selected_db = result[0];
-        }
         this.$("[name=db]").replaceWith(QWeb.render('Login.dblist', { db_list: this.db_list, selected_db: this.selected_db}));
         if(this.db_list.length === 0) {
             this.do_action("database_manager");