odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] problem in database manager when db list is desactivated 

lp bug: https://launchpad.net/bugs/1166856 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130527122415-pk8i2uqfrgyiac83
This commit is contained in:
niv-openerp 2013-05-27 14:24:15 +02:00
parent c40b3825d7 9182621004
commit 97110c0a48
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/web/controllers/main.py
View File

@ -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'}

2
addons/web/static/src/js/chrome.js
View File

@ -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;