diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-02-28 16:51:12 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-02-28 16:51:12 +0100 |
| commit | 1331af91d40ceb50b3fd8ff2988abcd687a1d56d (patch) | |
| tree | 0d079cebe07b3e125b6a3bb598f07ca3ad0323f5 /addons/web/static/src | |
| parent | 6ad4482d7108122df21a3e3d8703b0c6572d6b00 (diff) | |
[IMP] web_form: multifile, don't set_value with object
bzr revid: chm@openerp.com-20130228155112-z6jhpljfuvwiw1yd
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 30 |
2 files changed, 16 insertions, 17 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4e165f6054a..2b0af459259 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5046,12 +5046,9 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change ); }, set_value: function(value_) { - var self = this; value_ = value_ || []; if (value_.length >= 1 && value_[0] instanceof Array) { value_ = value_[0][2]; - } else if (value_.length >= 1 && value_[0] instanceof Object) { - value_ = _.map(value_, function (value) { self.data[value.id] = value; return value.id;}); } this._super(value_); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 36695d22ca5..6d86dd936e7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1263,20 +1263,22 @@ </t> <t t-name="FieldBinaryFileUploader.files"> <div class="oe_attachments"> - <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="id"> - <t t-set="file" t-value="widget.data[id]"/> - <div class="oe_attachment"> - <span t-if="(file.upload or file.percent_loaded<100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}"> - <span class="oe_fileuploader_in_process">...Upload in progress...</span> - <t t-raw="file.name || file.filename"/> - </span> - <a t-if="(!file.upload or file.percent_loaded>=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> - <t t-raw="file.name || file.filename"/> - </a> - <t t-if="(!file.upload or file.percent_loaded>=100)"> - <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a> - </t> - </div> + <t t-if="!widget.get('effective_readonly')"> + <t t-foreach="widget.get('value')" t-as="id"> + <t t-set="file" t-value="widget.data[id]"/> + <div class="oe_attachment"> + <span t-if="(file.upload or file.percent_loaded<100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}"> + <span class="oe_fileuploader_in_process">...Upload in progress...</span> + <t t-raw="file.name || file.filename"/> + </span> + <a t-if="(!file.upload or file.percent_loaded>=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> + <t t-raw="file.name || file.filename"/> + </a> + <t t-if="(!file.upload or file.percent_loaded>=100)"> + <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a> + </t> + </div> + </t> </t> <t t-if="widget.get('effective_readonly')"> <t t-foreach="widget.get('value')" t-as="id"> |