From bfb9896ddd49e29eb43a80ab0b668beef4536e32 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Mar 2012 11:46:32 +0100
Subject: [PATCH] [FIX] database/create replaced by blocking
 database/create_database (so we can use a multi-workers OpenERP server;
 otherwise polling on the server would hit different workers resulting in
 errors).

bzr revid: vmt@openerp.com-20120307104632-w6cs6nxf04ltcpf1
---
 addons/web/controllers/main.py     |  8 ++---
 addons/web/static/src/js/chrome.js | 51 +++++-------------------------
 2 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 71d01e2ef0a..a1d8f77ec70 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -358,11 +358,7 @@ class Database(openerpweb.Controller):
         return {"db_list": dbs}
 
     @openerpweb.jsonrequest
-    def progress(self, req, password, id):
-        return req.session.proxy('db').get_progress(password, id)
-
-    @openerpweb.jsonrequest
-    def create(self, req, fields):
+    def create_database(self, req, fields):
 
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         create_attrs = (
@@ -374,7 +370,7 @@ class Database(openerpweb.Controller):
         )
 
         try:
-            return req.session.proxy("db").create(*create_attrs)
+            return req.session.proxy("db").create_database(*create_attrs)
         except xmlrpclib.Fault, e:
             if e.faultCode and isinstance(e.faultCode, str)\
                 and e.faultCode.split(':')[0] == 'AccessDenied':
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 132cc3b5851..4115bd12fea 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -344,44 +344,6 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
         });
         return result;
     },
-    /**
-     * Waits until the new database is done creating, then unblocks the UI and
-     * logs the user in as admin
-     *
-     * @param {Number} db_creation_id identifier for the db-creation operation, used to fetch the current installation progress
-     * @param {Object} info info fields for this database creation
-     * @param {String} info.db name of the database being created
-     * @param {String} info.password super-admin password for the database
-     */
-    wait_for_newdb: function (db_creation_id, info) {
-        var self = this;
-        self.rpc('/web/database/progress', {
-            id: db_creation_id,
-            password: info.password
-        }, function (result) {
-            var progress = result[0];
-            // I'd display a progress bar, but turns out the progress status
-            // the server report kind-of blows goats: it's at 0 for ~75% of
-            // the installation, then jumps to 75%, then jumps down to either
-            // 0 or ~40%, then back up to 75%, then terminates. Let's keep that
-            // mess hidden behind a not-very-useful but not overly weird
-            // message instead.
-            if (progress < 1) {
-                setTimeout(function () {
-                    self.wait_for_newdb(db_creation_id, info);
-                }, 500);
-                return;
-            }
-
-            var admin = result[1][0];
-            setTimeout(function () {
-                self.widget_parent.do_login(
-                        info.db, admin.login, admin.password);
-                self.stop();
-                self.unblockUI();
-            });
-        });
-    },
     /**
      * Blocks UI and replaces $.unblockUI by a noop to prevent third parties
      * from unblocking the UI
@@ -422,7 +384,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
             submitHandler: function (form) {
                 var fields = $(form).serializeArray();
                 self.blockUI();
-                self.rpc("/web/database/create", {'fields': fields}, function(result) {
+                self.rpc("/web/database/create_database", {'fields': fields}, function(result) {
                     if (result.error) {
                         self.unblockUI();
                         self.display_error(result);
@@ -433,11 +395,14 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                         self.db_list.sort();
                         self.widget_parent.set_db_list(self.db_list);
                     }
+
                     var form_obj = self.to_object(fields);
-                    self.wait_for_newdb(result, {
-                        password: form_obj['super_admin_pwd'],
-                        db: form_obj['db_name']
-                    });
+                    self.widget_parent.do_login(
+                            form_obj['db_name'],
+                            'admin',
+                            form_obj['create_admin_pwd']);
+                    self.stop();
+                    self.unblockUI();
                 });
             }
         });