diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 38558b26e7c..4b23316e252 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1245,19 +1245,6 @@ class Binary(openerpweb.Controller): [('Content-Type', 'application/octet-stream'), ('Content-Disposition', content_disposition(filename, req))]) - @openerpweb.httprequest - def download_attachment(self, req, model, id, method, attachment_id, **kw): - Model = req.session.model(model) - res = getattr(Model, method)(int(id), int(attachment_id)) - if res: - filecontent = base64.b64decode(res.get('base64')) - filename = res.get('filename') - if filecontent and filename: - return req.make_response(filecontent, - headers=[('Content-Type', 'application/octet-stream'), - ('Content-Disposition', content_disposition(filename, req))]) - return req.not_found() - @openerpweb.httprequest def saveas_ajax(self, req, data, token): jdata = simplejson.loads(data) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a15bfb90276..a0e7f570b73 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5124,7 +5124,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie // TODO : activate send on wizard and form if (result.error || !result.id ) { - this.do_warn( instance.web.qweb.render('message_error_uploading'), result.error); + this.do_warn( _t('Uploading error'), result.error); files = _.filter(files, function (val) { return !val.upload; }); } else { for(var i in files){ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ad619345c45..e50d6c68ffa 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -636,8 +636,6 @@ -Uploading error -