[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:
commit
97110c0a48
|
@ -769,14 +769,6 @@ class Database(openerpweb.Controller):
|
||||||
params['db_lang'],
|
params['db_lang'],
|
||||||
params['create_admin_pwd'])
|
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
|
@openerpweb.jsonrequest
|
||||||
def duplicate(self, req, fields):
|
def duplicate(self, req, fields):
|
||||||
params = dict(map(operator.itemgetter('name', 'value'), fields))
|
params = dict(map(operator.itemgetter('name', 'value'), fields))
|
||||||
|
@ -785,7 +777,6 @@ class Database(openerpweb.Controller):
|
||||||
params['db_original_name'],
|
params['db_original_name'],
|
||||||
params['db_name'],
|
params['db_name'],
|
||||||
)
|
)
|
||||||
|
|
||||||
return req.session.proxy("db").duplicate_database(*duplicate_attrs)
|
return req.session.proxy("db").duplicate_database(*duplicate_attrs)
|
||||||
|
|
||||||
@openerpweb.jsonrequest
|
@openerpweb.jsonrequest
|
||||||
|
@ -793,9 +784,9 @@ class Database(openerpweb.Controller):
|
||||||
password, db = operator.itemgetter(
|
password, db = operator.itemgetter(
|
||||||
'drop_pwd', 'drop_db')(
|
'drop_pwd', 'drop_db')(
|
||||||
dict(map(operator.itemgetter('name', 'value'), fields)))
|
dict(map(operator.itemgetter('name', 'value'), fields)))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return req.session.proxy("db").drop(password, db)
|
if req.session.proxy("db").drop(password, db):return True
|
||||||
except xmlrpclib.Fault, e:
|
except xmlrpclib.Fault, e:
|
||||||
if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
|
if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
|
||||||
return {'error': e.faultCode, 'title': 'Drop Database'}
|
return {'error': e.faultCode, 'title': 'Drop Database'}
|
||||||
|
|
|
@ -380,7 +380,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
|
||||||
var fetch_langs = this.rpc("/web/session/get_lang_list", {}).done(function(result) {
|
var fetch_langs = this.rpc("/web/session/get_lang_list", {}).done(function(result) {
|
||||||
self.lang_list = 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() {
|
do_render: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
Loading…
Reference in New Issue