diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c43f2b57476..93e08db64ea 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -769,14 +769,6 @@ class Database(openerpweb.Controller): params['db_lang'], params['create_admin_pwd']) - @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)) @@ -785,7 +777,6 @@ class Database(openerpweb.Controller): params['db_original_name'], params['db_name'], ) - return req.session.proxy("db").duplicate_database(*duplicate_attrs) @openerpweb.jsonrequest @@ -793,9 +784,9 @@ class Database(openerpweb.Controller): 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'} diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 3944078a5a7..de49b11645d 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -380,7 +380,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ 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;