From ee9a9558c0f7a0e290ebcdfb0ce0b9be9751daf8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Jan 2012 15:35:18 +0100
Subject: [PATCH 1/4] [IMP] add doc to Binary.saveas, and rename a field for
 clarity

bzr revid: xmo@openerp.com-20120110143518-ircd8x1feyf5rquf
---
 addons/web/controllers/main.py        | 24 +++++++++++++++++++-----
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/xml/base.xml    |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 852d5138177..7db8782b52e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1184,20 +1184,34 @@ class Binary(openerpweb.Controller):
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
 
     @openerpweb.httprequest
-    def saveas(self, req, model, id, field, fieldname, **kw):
+    def saveas(self, req, model, field, id=None, filename_field=None, **kw):
+        """ Download link for files stored as binary fields.
+
+        If the ``id`` parameter is omitted, fetches the default value for the
+        binary field (via ``default_get``), otherwise fetches the field for
+        that precise record.
+
+        :param req: OpenERP request
+        :type req: :class:`web.common.http.HttpRequest`
+        :param str model: name of the model to fetch the binary from
+        :param str field: binary field
+        :param str id: id of the record from which to fetch the binary
+        :param str filename_field: field holding the file's name, if any
+        :returns: :class:`werkzeug.wrappers.Response`
+        """
         Model = req.session.model(model)
         context = req.session.eval_context(req.context)
         if id:
-            res = Model.read([int(id)], [field, fieldname], context)[0]
+            res = Model.read([int(id)], [field, filename_field], context)[0]
         else:
-            res = Model.default_get([field, fieldname], context)
+            res = Model.default_get([field, filename_field], context)
         filecontent = base64.b64decode(res.get(field, ''))
         if not filecontent:
             return req.not_found()
         else:
             filename = '%s_%s' % (model.replace('.', '_'), id)
-            if fieldname:
-                filename = res.get(fieldname, '') or filename
+            if filename_field:
+                filename = res.get(filename_field, '') or filename
             return req.make_response(filecontent,
                 [('Content-Type', 'application/octet-stream'),
                  ('Content-Disposition', 'attachment; filename=' +  filename)])
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4f08e909f3e..159fedbc71e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3023,7 +3023,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
     on_save_as: function() {
         var url = '/web/binary/saveas?session_id=' + this.session.session_id + '&model=' +
             this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name +
-            '&fieldname=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime());
+            '&filename_field=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime());
         window.open(url);
     },
     on_clear: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d4bb5122500..642f1f89709 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -748,7 +748,7 @@
         <li t-foreach="attachments" t-as="attachment">
             <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
                 + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
-                + '&amp;field=datas&amp;fieldname=name&amp;t=' + (new Date().getTime())"/>
+                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
             <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
                 <t t-esc="attachment.name"/>
             </a>

From 4cc9cb83cede980383709dfebe6ce48d436aaa7f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Jan 2012 15:35:56 +0100
Subject: [PATCH 2/4] [IMP] add bin_size flag to listview reads in order not to
 fetch binary file contents

bzr revid: xmo@openerp.com-20120110143556-ijsmmhvenw93vzfb
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 1c4911974fe..6b1621af74c 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1289,7 +1289,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
             page = this.datagroup.openable ? this.page : view.page;
 
         var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name');
-        var options = { offset: page * limit, limit: limit };
+        var options = { offset: page * limit, limit: limit, context: {bin_size: true} };
         //TODO xmo: investigate why we need to put the setTimeout
         $.async_when().then(function() {dataset.read_slice(fields, options , function (records) {
             // FIXME: ignominious hacks, parents (aka form view) should not send two ListView#reload_content concurrently

From d98b8b8be0145700667c0f4cc0e7619dec790c5b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Jan 2012 16:39:05 +0100
Subject: [PATCH 3/4] [ADD] handling of binary fields to the listview

bzr revid: xmo@openerp.com-20120110153905-zxqkze9c4zrkmv2a
---
 addons/web/controllers/main.py        |  7 ++--
 addons/web/static/src/js/formats.js   | 49 ++++++++++++++++++++-------
 addons/web/static/src/js/view_list.js | 20 +++++++++--
 3 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7db8782b52e..c775927a8cc 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1201,10 +1201,13 @@ class Binary(openerpweb.Controller):
         """
         Model = req.session.model(model)
         context = req.session.eval_context(req.context)
+        fields = [field]
+        if filename_field:
+            fields.append(filename_field)
         if id:
-            res = Model.read([int(id)], [field, filename_field], context)[0]
+            res = Model.read([int(id)], fields, context)[0]
         else:
-            res = Model.default_get([field, filename_field], context)
+            res = Model.default_get(fields, context)
         filecontent = base64.b64decode(res.get(field, ''))
         if not filecontent:
             return req.not_found()
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 2418439ac46..4076c190a74 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -237,7 +237,15 @@ openerp.web.auto_date_to_str = function(value, type) {
 };
 
 /**
- * Formats a provided cell based on its field type
+ * Formats a provided cell based on its field type. Most of the field types
+ * return a correctly formatted value, but some tags and fields are
+ * special-cased in their handling:
+ *
+ * * buttons will return an actual ``<button>`` tag with a bunch of error handling
+ *
+ * * boolean fields will return a checkbox input, potentially disabled
+ *
+ * * binary fields will return a link to download the binary data as a file
  *
  * @param {Object} row_data record whose values should be displayed in the cell
  * @param {Object} column column descriptor
@@ -245,21 +253,21 @@ openerp.web.auto_date_to_str = function(value, type) {
  * @param {String} column.type widget type for a field control
  * @param {String} [column.string] button label
  * @param {String} [column.icon] button icon
- * @param {String} [value_if_empty=''] what to display if the field's value is ``false``
- * @param {Boolean} [process_modifiers=true] should the modifiers be computed ?
+ * @param {Object} [options]
+ * @param {String} [options.value_if_empty=''] what to display if the field's value is ``false``
+ * @param {Boolean} [options.process_modifiers=true] should the modifiers be computed ?
+ * @param {String} [options.model] current record's model
+ * @param {Number} [options.id] current record's id
+ *
  */
-openerp.web.format_cell = function (row_data, column, value_if_empty, process_modifiers) {
+openerp.web.format_cell = function (row_data, column, options) {
+    options = options || {};
     var attrs = {};
-    if (process_modifiers !== false) {
+    if (options.process_modifiers !== false) {
         attrs = column.modifiers_for(row_data);
     }
     if (attrs.invisible) { return ''; }
 
-    if (column.type === "boolean") {
-        return _.str.sprintf('<input type="checkbox" %s disabled="disabled"/>',
-                 row_data[column.id].value ? 'checked="checked"' : '');
-    }
-
     if (column.tag === 'button') {
         return _.template('<button type="button" title="<%-title%>" <%=additional_attributes%> >' +
             '<img src="<%-prefix%>/web/static/src/img/icons/<%-icon%>.png" alt="<%-alt%>"/>' +
@@ -269,14 +277,29 @@ openerp.web.format_cell = function (row_data, column, value_if_empty, process_mo
                     'disabled="disabled" class="oe-listview-button-disabled"' : '',
                 prefix: openerp.connection.prefix,
                 icon: column.icon,
-                alt: column.string || '',
+                alt: column.string || ''
             });
     }
     if (!row_data[column.id]) {
-        return value_if_empty === undefined ? '' : value_if_empty;
+        return options.value_if_empty === undefined ? '' : options.value_if_empty;
     }
+
+    switch (column.type) {
+    case "boolean":
+        return _.str.sprintf('<input type="checkbox" %s disabled="disabled"/>',
+                 row_data[column.id].value ? 'checked="checked"' : '');
+    case "binary":
+        return _.str.sprintf('<a href="%(href)s">%(text)s</a> (%(size)s)', {
+            text: _t("Download"),
+            href: _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
+                    openerp.connection.session_id, options.model,
+                    column.id, options.id),
+            size: row_data[column.id].value
+        });
+    }
+
     return openerp.web.format_value(
-            row_data[column.id].value, column, value_if_empty);
+            row_data[column.id].value, column, options.value_if_empty);
 }
 
 };
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 6b1621af74c..70ae337b903 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -685,6 +685,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         this.display_aggregates(aggregates);
     },
     display_aggregates: function (aggregation) {
+        var self = this;
         var $footer_cells = this.$element.find('.oe-list-footer');
         _(this.aggregate_columns).each(function (column) {
             if (!column['function']) {
@@ -692,7 +693,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             }
 
             $footer_cells.filter(_.str.sprintf('[data-field=%s]', column.id))
-                .html(openerp.web.format_cell(aggregation, column, undefined, false));
+                .html(openerp.web.format_cell(aggregation, column, {
+                    process_modifiers: false,
+                    model: self.dataset.model
+            }));
         });
     },
     get_selected_ids: function() {
@@ -846,6 +850,9 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                     return self.reload_record(self.records.get(record_id));
                 }]);
             })
+            .delegate('a', 'click', function (e) {
+                e.stopPropagation();
+            })
             .delegate('tr', 'click', function (e) {
                 e.stopPropagation();
                 var row_id = self.row_id(e.currentTarget);
@@ -905,7 +912,10 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                 });
             }
         }
-        return openerp.web.format_cell(record.toForm().data, column);
+        return openerp.web.format_cell(record.toForm().data, column, {
+            model: this.dataset.model,
+            id: record.get('id')
+        });
     },
     render: function () {
         if (this.$current) {
@@ -1211,7 +1221,11 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     return column.id === group.grouped_on; });
                 try {
                     $group_column.html(openerp.web.format_cell(
-                        row_data, group_column, _t("Undefined"), false));
+                        row_data, group_column, {
+                            value_if_empty: _t("Undefined"),
+                            process_modifiers: false,
+                            model: self.dataset.model
+                        }));
                 } catch (e) {
                     $group_column.html(row_data[group_column.id].value);
                 }

From d54a19681110663aa8016f73b70c1663cc2a2b10 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Jan 2012 16:50:20 +0100
Subject: [PATCH 4/4] [IMP] correctly handle filenames in list view binaries

bzr revid: xmo@openerp.com-20120110155020-ab02qb0ktlfxnwvb
---
 addons/web/controllers/main.py      |  2 +-
 addons/web/static/src/js/formats.js | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index c775927a8cc..b6405873f80 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1217,7 +1217,7 @@ class Binary(openerpweb.Controller):
                 filename = res.get(filename_field, '') or filename
             return req.make_response(filecontent,
                 [('Content-Type', 'application/octet-stream'),
-                 ('Content-Disposition', 'attachment; filename=' +  filename)])
+                 ('Content-Disposition', 'attachment; filename="%s"' % filename)])
 
     @openerpweb.httprequest
     def upload(self, req, callback, ufile):
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 4076c190a74..819301f9e55 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -289,11 +289,18 @@ openerp.web.format_cell = function (row_data, column, options) {
         return _.str.sprintf('<input type="checkbox" %s disabled="disabled"/>',
                  row_data[column.id].value ? 'checked="checked"' : '');
     case "binary":
+        var text = _t("Download"),
+            download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', openerp.connection.session_id, options.model, column.id, options.id);
+        if (column.filename) {
+            download_url += '&filename_field=' + column.filename;
+            if (row_data[column.filename]) {
+                text = _.str.sprintf(_t("Download \"%s\""), openerp.web.format_value(
+                        row_data[column.filename].value, {type: 'char'}));
+            }
+        }
         return _.str.sprintf('<a href="%(href)s">%(text)s</a> (%(size)s)', {
-            text: _t("Download"),
-            href: _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
-                    openerp.connection.session_id, options.model,
-                    column.id, options.id),
+            text: text,
+            href: download_url,
             size: row_data[column.id].value
         });
     }