Merge lp:~openerp-dev/openerp-web/trunk-webdb-niv into lp:openerp-web

[Nicolas Vanhoren (OpenERP)]

I let you merge it if you need it.

Unmerged revisions

3876. By Nicolas Vanhoren (OpenERP) on 2013-11-06

Fixed problem with not setting correctly the db in the session and rewrite a part of the web_admin method.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-11-05 15:21:38 +0000
+++ addons/web/controllers/main.py	2013-11-06 14:35:55 +0000
@@ -537,12 +537,11 @@
     def web_client(self, s_action=None, db=None, debug=False, **kw):
         debug = debug != False
 
+        # if a db is explicitely specified, we check it's a valid database (even if we can't list the dbs),
+        # if it's not we ignore that parameter
         lst = http.db_list(True)
         if db not in lst:
             db = None
-        guessed_db = http.db_monodb(request.httprequest)
-        if guessed_db is None and len(lst) > 0:
-            guessed_db = lst[0]
 
         def redirect(db):
             query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
@@ -550,21 +549,37 @@
             redirect = request.httprequest.path + '?' + urllib.urlencode(query)
             return redirect_with_hash(redirect)
 
-        if db is None and guessed_db is not None:
-            return redirect(guessed_db)
+        # it we don't have an explicit db, we try to guess the default database. If the --db-filters could
+        # not match a single db, we take a look at all the valid ones and take the first one if it exists.
+        if db is None:
+            guessed_db = request.session.db
+            if guessed_db is None:
+                # TODO: check there is no exceptions
+                try:
+                    nlst = http.db_list(False)
+                except openerp.exceptions.AccessDenied, e:
+                    nlst = []
+                if len(nlst) > 0:
+                    guessed_db = nlst[0]
+            # if there is no specified db and we were able to guess a db we redirect to a url that explicitely
+            # target that db
+            if guessed_db is not None:
+                return redirect(guessed_db)
 
-        if db is not None and db != guessed_db:
+        # if the db differs from the one stored in the session, we reinit the session
+        if db != request.session.db:
             request.session.logout()
             request.session.db = db
-            guessed_db = db
-
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=guessed_db, debug=debug))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=guessed_db, debug=debug))
+
+        # at this point, it's still possible that db is None, which is the case when there are no dbs at all
+
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db, debug=debug))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=db, debug=debug))
 
         r = html_template % {
             'js': js,
             'css': css,
-            'modules': simplejson.dumps(module_boot(db=guessed_db)),
+            'modules': simplejson.dumps(module_boot(db=db)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
         return request.make_response(r, {'Cache-Control': 'no-cache', 'Content-Type': 'text/html; charset=utf-8'})