Merge lp:~openerp-dev/openerp-web/7.0-bug-1166856-vme into lp:openerp-web/7.0

[Vidhin Mehta (OpenERP)]

Remove extra duplicate method, show error msg when invalid db to drop, do_render method call always after fetch_db.

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

* The change to chrome.js is complete nonsense, if fetch_db is faster than fetch_langs, do_render() will execute before fetch_langs has returned.
* I fail to see the value in doing an extra rpc request just to check if the DB exists, .drop() already returns False if the db didn't exist, so can just use that.

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-bug-1166856-vme]

3908. By Vidhin Mehta (OpenERP) on 2013-05-16

[FIX]add callback function to fetch_lang and in *drop db* which is not created,after drop it shows 'db succesfully droped'.

[Vidhin Mehta (OpenERP) (vme-openerp)]

Add callback function to fetch_lang. In *drop db* functionality, database with wrong name also shows "The database has been dropped."

review: Needs Resubmitting

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

> Add callback function to fetch_lang.

Why don't you just use the original code and replace `done` by `always`? Your change makes the calls sequential (it'll wait until the langs are fetched before fetching the db list) even though there's no actual dependency between them.

review: Needs Fixing

[Vidhin Mehta (OpenERP) (vme-openerp)]

According to original code fetch_db must resolve to call *do_render* method, which is wrong when we configue server with "--no-database-list".So,It should not depended on fetch_db object to resolve.

Don't know about behaviour of fetch_langs (resolve or not), so i have kept as it is.

review: Needs Resubmitting

[lp:~openerp-dev/openerp-web/7.0-bug-1166856-vme]

3909. By Vidhin Mehta (OpenERP) on 2013-05-17

[IMP]

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-05-16 13:22:00 +0000
+++ addons/web/controllers/main.py	2013-05-17 11:07:24 +0000
@@ -772,20 +772,11 @@
     @openerpweb.jsonrequest
     def duplicate(self, req, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
-        return req.session.proxy("db").duplicate_database(
-            params['super_admin_pwd'],
-            params['db_original_name'],
-            params['db_name'])
-
-    @openerpweb.jsonrequest
-    def duplicate(self, req, fields):
-        params = dict(map(operator.itemgetter('name', 'value'), fields))
         duplicate_attrs = (
             params['super_admin_pwd'],
             params['db_original_name'],
             params['db_name'],
         )
-
         return req.session.proxy("db").duplicate_database(*duplicate_attrs)
 
     @openerpweb.jsonrequest
@@ -793,9 +784,9 @@
         password, db = operator.itemgetter(
             'drop_pwd', 'drop_db')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
-
+        
         try:
-            return req.session.proxy("db").drop(password, db)
+            if req.session.proxy("db").drop(password, db):return True
         except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Drop Database'}

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-05-06 13:50:31 +0000
+++ addons/web/static/src/js/chrome.js	2013-05-17 11:07:24 +0000
@@ -380,7 +380,7 @@
         var fetch_langs = this.rpc("/web/session/get_lang_list", {}).done(function(result) {
             self.lang_list = result;
         });
-        return $.when(fetch_db, fetch_langs).done(self.do_render);
+        return $.when(fetch_db, fetch_langs).always(self.do_render);
     },
     do_render: function() {
         var self = this;