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

[Antony Lesuisse (OpenERP)]

[Antony Lesuisse (OpenERP) (al-openerp)]

dont merge it it's wrong i tell you by phone

[Christophe Simonis (OpenERP) (kangol)]

1/ in js: use instance.web.redirect(url) instead of setting window.location
2/ in py: do not change the api of db_monodb(), create a new function for the purpose of returning a tuple...

review: Needs Fixing

[Fabien Meghazi (OpenERP) (fme)]

done

PS: the status of this merge proposal is "Work in Progress", not "Needs Review".

[Fabien Meghazi (OpenERP) (fme)]

As no description about this branch has been given, here it is :

This branch provides a monodb behavior without the need of server's switch --load (which will be deprecated)

- On the client, the url is changed when another database is selected.

- When another database is selected, a cookie is set so the Home controller knows which database should be selected by default.

- If there's no database on the server, the database manager is started.

- If no 'db' url parameter is present in the request and if there's more than one database on the server, the Home controller send a redirection to an url with the appropriate 'db' url parameter.

[lp:~openerp-dev/openerp-web/7.0-monodb-login-screen-fme]

3806. By Fabien Meghazi (OpenERP) on 2013-03-05

[REM] Removed database check, this is not the role of the controller to reject a bad database name

[Fabien Meghazi (OpenERP) (fme)]

Linked merge proposal:

https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-monodb-login-screen-fme/+merge/151076

[lp:~openerp-dev/openerp-web/7.0-monodb-login-screen-fme]

3807. By Antony Lesuisse (OpenERP) on 2013-03-05

db_monodb use the new implementation

3808. By Antony Lesuisse (OpenERP) on 2013-03-06

db_monodb better version and naming

3809. By Fabien Meghazi (OpenERP) on 2013-03-06

[FIX] db_monodb: cookie not used. keep same behavior as previous

3810. By Fabien Meghazi (OpenERP) on 2013-03-06

[FIX] Restore cookie_db check

3811. By Fabien Meghazi (OpenERP) on 2013-03-07

[FIX] Add redirect helper for IE<10 (looses hash on redirects)

3812. By Fabien Meghazi (OpenERP) on 2013-03-07

[FIX] Use new db parameter after database creation's reload

3813. By Fabien Meghazi (OpenERP) on 2013-03-07

[ADD] Restore timestamp in Reload

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-03-06 10:07:01 +0000
+++ addons/web/controllers/main.py	2013-03-07 17:38:22 +0000
@@ -15,6 +15,7 @@
 import time
 import urllib
 import urllib2
+import urlparse
 import xmlrpclib
 import zlib
 from xml.etree import ElementTree
@@ -92,16 +93,50 @@
     dbs = [i for i in dbs if re.match(r, i)]
     return dbs
 
-def db_monodb(req):
-    # if only one db exists, return it else return False
+def db_monodb_redirect(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)
-        if len(dbs) == 1:
-            return dbs[0]
     except xmlrpclib.Fault:
         # ignore access denied
-        pass
-    return False
+        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:
+        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]
+
+def redirect_with_hash(req, url, code=303):
+    if req.httprequest.user_agent.browser == 'msie':
+        try:
+            version = float(req.httprequest.user_agent.version)
+            if version < 10:
+                return "<html><head><script>window.location = '%s#' + location.hash;</script></head></html>" % url
+        except Exception:
+            pass
+    return werkzeug.utils.redirect(url, code)
 
 def module_topological_sort(modules):
     """ Return a list of module names sorted so that their dependencies of the
@@ -292,6 +327,10 @@
     return r
 
 def manifest_list(req, extension, mods=None, db=None):
+    """ list ressources to load specifying either:
+    mods: a comma separated string listing modules
+    db: a database name (return all installed modules in that database)
+    """
     if not req.debug:
         path = '/web/webclient/' + extension
         if mods is not None:
@@ -530,6 +569,10 @@
 
     @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))
 

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-02-27 11:31:32 +0000
+++ addons/web/static/src/js/chrome.js	2013-03-07 17:38:22 +0000
@@ -478,7 +478,16 @@
                     'login': 'admin',
                     'password': form_obj['create_admin_pwd'],
                     'login_successful': function() {
-                        self.do_action("reload");
+                        var action = {
+                            type: "ir.actions.client",
+                            tag: 'reload',
+                            params: {
+                                url_search : {
+                                    db: form_obj['db_name'],
+                                },
+                            }
+                        };
+                        self.do_action(action);
                     },
                 },
                 _push_me: false,
@@ -589,6 +598,11 @@
 instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
+    events: {
+        'change input[name=db],select[name=db]': function(ev) {
+            this.set('database_selector', $(ev.currentTarget).val());
+        },
+    },
 
     init: function(parent, action) {
         this._super(parent);
@@ -600,18 +614,18 @@
         if (_.isEmpty(this.params)) {
             this.params = $.bbq.getState(true);
         }
+        if (action && action.params && action.params.db) {
+            this.params.db = action.params.db;
+        } 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);
         }
-
-        if (this.has_local_storage && this.remember_credentials) {
-            this.selected_db = localStorage.getItem('last_db_login_success');
-            this.selected_login = localStorage.getItem('last_login_login_success');
-            if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
-                this.selected_password = localStorage.getItem('last_password_login_success');
-            }
-        }
     },
     start: function() {
         var self = this;
@@ -619,10 +633,10 @@
         self.$el.find('.oe_login_manage_db').click(function() {
             self.do_action("database_manager");
         });
+        self.on('change:database_selector', this, function() {
+            this.database_selected(this.get('database_selector'));
+        });
         var d = $.when();
-        if ($.deparam.querystring().db) {
-            self.params.db = $.deparam.querystring().db;
-        }
         if ($.param.fragment().token) {
             self.params.token = $.param.fragment().token;
         }
@@ -630,16 +644,44 @@
         if (self.params.db && self.params.login && self.params.password) {
             d = self.do_login(self.params.db, self.params.login, self.params.password);
         } else {
-            if (self.params.db) {
-                self.on_db_loaded([self.params.db])
-            } else {
-                d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed);
-            }
+            d = self.rpc("/web/database/get_list", {})
+                .done(self.on_db_loaded)
+                .fail(self.on_db_failed)
+                .always(function() {
+                    if (self.selected_db && self.has_local_storage && self.remember_credentials) {
+                        self.$("[name=login]").val(localStorage.getItem(self.selected_db + '|last_login') || '');
+                        if (self.session.debug) {
+                            self.$("[name=password]").val(localStorage.getItem(self.selected_db + '|last_password') || '');
+                        }
+                    }
+                });
         }
         return d;
     },
+    remember_last_used_database: function(db) {
+        // This cookie will be used server side in order to avoid db reloading on first visit
+        var ttl = 24 * 60 * 60 * 365;
+        document.cookie = [
+            'last_used_database=' + db,
+            'path=/',
+            'max-age=' + ttl,
+            'expires=' + new Date(new Date().getTime() + ttl * 1000).toGMTString()
+        ].join(';');
+    },
+    database_selected: function(db) {
+        var params = $.deparam.querystring();
+        params.db = db;
+        this.remember_last_used_database(db);
+        this.$('.oe_login_dbpane').empty().text(_t('Loading...'));
+        this.$('[name=login], [name=password]').prop('readonly', true);
+        instance.web.redirect('/?' + $.param(params));
+    },
     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");
@@ -680,17 +722,11 @@
         self.hide_error();
         self.$(".oe_login_pane").fadeOut("slow");
         return this.session.session_authenticate(db, login, password).then(function() {
-            if (self.has_local_storage) {
-                if(self.remember_credentials) {
-                    localStorage.setItem('last_db_login_success', db);
-                    localStorage.setItem('last_login_login_success', login);
-                    if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
-                        localStorage.setItem('last_password_login_success', password);
-                    }
-                } else {
-                    localStorage.setItem('last_db_login_success', '');
-                    localStorage.setItem('last_login_login_success', '');
-                    localStorage.setItem('last_password_login_success', '');
+            self.remember_last_used_database(db);
+            if (self.has_local_storage && self.remember_credentials) {
+                localStorage.setItem(db + '|last_login', login);
+                if (self.session.debug) {
+                    localStorage.setItem(db + '|last_password', password);
                 }
             }
             self.trigger('login_successful');
@@ -748,6 +784,9 @@
 
     var sobj = $.deparam(l.search.substr(1));
     sobj.ts = new Date().getTime();
+    if (params.url_search) {
+        sobj = _.extend(sobj, params.url_search);
+    }
     var search = '?' + $.param(sobj);
 
     var hash = l.hash;

=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js	2012-12-27 07:44:38 +0000
+++ addons/web/static/src/js/coresetup.js	2013-03-07 17:38:22 +0000
@@ -89,6 +89,10 @@
         });
     },
     session_is_valid: function() {
+        var db = $.deparam.querystring().db;
+        if (db && this.db !== db) {
+            return false;
+        }
         return !!this.uid;
     },
     /**

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-03-06 15:13:06 +0000
+++ addons/web/static/src/xml/base.xml	2013-03-07 17:38:22 +0000
@@ -71,9 +71,9 @@
                 </div>
                 <ul>
                     <li>Username</li>
-                    <li><input name="login" type="text" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
+                    <li><input name="login" type="text" value="" autofocus="autofocus"/></li>
                     <li>Password</li>
-                    <li><input name="password" type="password" t-att-value="widget.selected_password || ''"/></li>
+                    <li><input name="password" type="password" value=""/></li>
                     <li><button name="submit">Log in</button></li>
                 </ul>
             </form>