summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2012-12-11 15:45:51 +0100
committerChristophe Matthieu <chm@openerp.com>2012-12-11 15:45:51 +0100
commitf817cd3f3868823a9880fff420e0932a55bb8ff7 (patch)
treecfdf5b40eef250830abb039ac62f2e4851c54a46 /addons/web/static/src
parent5944b6c6d6f72109214fb7072e021906854d55ee (diff)
[IMP] web: move controler download_attachment into mail. change render into _t
bzr revid: chm@openerp.com-20121211144551-9uryi1z1sxe9daxv
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js2
-rw-r--r--addons/web/static/src/xml/base.xml2
2 files changed, 1 insertions, 3 deletions
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 @@
</div>
</t>
-<t t-name="message_error_uploading">Uploading error</t>
-
<t t-name="TreeView">
<select t-if="toolbar" style="width: 30%">
</select>