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

[FIX] progressbar fields display in group headers 

also, weird computed progress bars (e.g. aggregates) with way too many digits

lp bug: https://launchpad.net/bugs/941316 fixed

bzr revid: xmo@openerp.com-20120227152739-3pmu3dtqrbzx1x3m
This commit is contained in:
Xavier Morel 2012-02-27 16:27:39 +01:00
parent 506b274977
commit 2b2ae48ea9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,7 @@ openerp.web.format_cell = function (row_data, column, options) {
case 'progressbar':
return _.template(
'<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
value: row_data[column.id].value
value: _.str.sprintf("%.0f", row_data[column.id].value)
});
}

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

@ -1257,9 +1257,11 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
if (column.meta) {
// do not do anything
} else if (column.id in group.aggregates) {
var value = group.aggregates[column.id];
var r = {};
r[column.id] = {value: group.aggregates[column.id]};
$('<td class="oe-number">')
.html(openerp.web.format_value(value, column))
.html(openerp.web.format_cell(
r, column, {process_modifiers: false}))
.appendTo($row);
} else {
$row.append('<td>');