odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Fabien Meghazi 2011-10-05 17:32:02 +02:00
parent 77a3624fa1
commit 65745d5142
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/static/src/js/formats.js
View File

@ -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 [

2
addons/web/static/src/js/view_list.js
View File

@ -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() {