From 65745d5142abcd4ecc426a429c9d919dbcb8ebc3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 5 Oct 2011 17:32:02 +0200 Subject: [PATCH] [FIX] Do not compute modifiers for aggregates in list view. lp bug: https://launchpad.net/bugs/865188 fixed bzr revid: fme@openerp.com-20111005153202-4ao575zh3885ukuy --- addons/web/static/src/js/formats.js | 8 ++++++-- addons/web/static/src/js/view_list.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index e7feedf26a5..d3d88bc3731 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -179,9 +179,13 @@ openerp.web.auto_date_to_str = function(value, type) { * @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 ? */ -openerp.web.format_cell = function (row_data, column, value_if_empty) { - var attrs = column.modifiers_for(row_data); +openerp.web.format_cell = function (row_data, column, value_if_empty, process_modifiers) { + var attrs = {}; + if (process_modifiers !== false) { + attrs = column.modifiers_for(row_data); + } if (attrs.invisible) { return ''; } if (column.tag === 'button') { return [ diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 7cceec03fb9..bb7b50244d8 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -620,7 +620,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# } $footer_cells.filter(_.sprintf('[data-field=%s]', column.id)) - .html(openerp.web.format_cell(aggregation, column)); + .html(openerp.web.format_cell(aggregation, column, undefined, false)); }); }, get_selected_ids: function() {