Merge lp:~openerp-dev/openerp-web/7.0-opw-603411-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue with file not downloaded when it is inside one2many or many2many with widget=one2many_list in listview.

Demo: Add many2many field with relation to ir.attachment in any test object, design the test object view in which many2many field will have inline tree view with widget="one2many_list", something like:
<record id="view_test_test_form_view" model="ir.ui.view">
    <fields ..../>
    <field name="linkeddocument_ids" nolabel="1" widget="one2many_list">
        <field name="datas_fname" invisible="1"/>
        <field name="name"/>
        <field name="datas" filename="datas_fname"/>
    </field>

Now add a record with one attachment in that model's record and save the whole record, you will be having download link in record of one2many_list widget, when you click on that file is not downloaded propoerly with proper name, improved the fix of bug #1077858, this fix causing the issue.

Thanks.

Unmerged revisions

4128. By Mohammed Shekha(OpenERP)<email address hidden> on 2014-01-28

[FIX]Fixed the issue with file not downloaded when it is inside one2many or many2many with widget=one2many_list in listview.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-01-23 17:08:36 +0000
+++ addons/web/controllers/main.py	2014-01-28 14:14:34 +0000
@@ -1305,6 +1305,9 @@
             fields.append(filename_field)
         if data:
             res = { field: data }
+            if id and filename_field:
+                file_name = Model.read([int(id)], [filename_field], context)[0][filename_field]
+                res.update({ filename_field: file_name })
         elif id:
             res = Model.read([int(id)], fields, context)[0]
         else:
 
=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2014-01-15 11:00:38 +0000
+++ addons/web/static/src/js/view_list.js	2014-01-28 14:14:34 +0000
@@ -2241,7 +2241,7 @@
         var text = _t("Download");
         var value = row_data[this.id].value;
         var download_url;
-        if (value && value.substr(0, 10).indexOf(' ') == -1) {
+        if (value && value.substr(0, 10).indexOf(' ') == -1 && instance.web.BufferedDataSet.virtual_id_regex.test(options.id)) {
             download_url = "data:application/octet-stream;base64," + value;
         } else {
             download_url = instance.session.url('/web/binary/saveas', {model: options.model, field: this.id, id: options.id});