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

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

bzr revid: vme@tinyerp.com-20130516170403-7oil1k6em99a1hmp
This commit is contained in:
Vidhin Mehta 2013-05-16 22:34:03 +05:30
parent 2d07136d6f
commit d6024fa36b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -780,17 +780,13 @@ class Database(openerpweb.Controller):
password, db = operator.itemgetter(
'drop_pwd', 'drop_db')(
dict(map(operator.itemgetter('name', 'value'), fields)))
error = {'error':_('Could not drop database !'), 'title': _('Drop Database') }
try:
proxy = req.session.proxy("db")
if db in proxy.list(True):
return proxy.drop(password, db)
else:
error.update({'error': "Database '%s' does not exist !" % db})
if req.session.proxy("db").drop(password, db):return True
except xmlrpclib.Fault, e:
if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
error.update({'error': e.faultCode})
return error
return {'error': e.faultCode, 'title': 'Drop Database'}
return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
@openerpweb.httprequest
def backup(self, req, backup_db, backup_pwd, token):

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_langs).done(fetch_db.always(self.do_render));
return $.when(fetch_langs).done(function(){fetch_db.always(self.do_render)});
},
do_render: function() {
var self = this;