diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 8936c40b051..2170cee46fd 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -753,7 +753,7 @@ instance.web.DataSetStatic = instance.web.DataSet.extend({ var offset = options.offset || 0, limit = options.limit || false; var end_pos = limit && limit !== -1 ? offset + limit : this.ids.length; - return this.read_ids(this.ids.slice(offset, end_pos), fields); + return this.read_ids(this.ids.slice(offset, end_pos), fields, options); }, set_ids: function (ids) { this.ids = ids; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index bed45dc28b5..52ad15f843e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4391,8 +4391,12 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ }); instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({ - get_context: function() { + get_context: function(extra_context) { this.context = this.o2m.build_context(); + if(extra_context) + { + this.context.add(extra_context); + } return this.context; } }); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index ee934d6a2c9..b08f5ca3bc9 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -2305,7 +2305,7 @@ instance.web.list.Binary = instance.web.list.Column.extend({ * @private */ _format: function (row_data, options) { - var text = _t("Download"); + var text = _t("Download"), filename=_t('Binary file'); var value = row_data[this.id].value; if (!value) { return options.value_if_empty || ''; @@ -2323,11 +2323,13 @@ instance.web.list.Binary = instance.web.list.Column.extend({ if (this.filename && row_data[this.filename]) { text = _.str.sprintf(_t("Download \"%s\""), instance.web.format_value( row_data[this.filename].value, {type: 'char'})); + filename = row_data[this.filename].value; } - return _.template('<%-text%> (<%-size%>)', { + return _.template('<%-text%> (<%-size%>)', { text: text, href: download_url, size: instance.web.binary_to_binsize(value), + download: filename, }); } });