[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:
parent
506b274977
commit
2b2ae48ea9
|
@ -336,7 +336,7 @@ openerp.web.format_cell = function (row_data, column, options) {
|
||||||
case 'progressbar':
|
case 'progressbar':
|
||||||
return _.template(
|
return _.template(
|
||||||
'<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
|
'<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
|
||||||
value: row_data[column.id].value
|
value: _.str.sprintf("%.0f", row_data[column.id].value)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1257,9 +1257,11 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
|
||||||
if (column.meta) {
|
if (column.meta) {
|
||||||
// do not do anything
|
// do not do anything
|
||||||
} else if (column.id in group.aggregates) {
|
} 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">')
|
$('<td class="oe-number">')
|
||||||
.html(openerp.web.format_value(value, column))
|
.html(openerp.web.format_cell(
|
||||||
|
r, column, {process_modifiers: false}))
|
||||||
.appendTo($row);
|
.appendTo($row);
|
||||||
} else {
|
} else {
|
||||||
$row.append('<td>');
|
$row.append('<td>');
|
||||||
|
|
Loading…
Reference in New Issue