pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_graph : display the corresponding label for selection fields in graph view

Browse Source
This commit is contained in:
Christophe Simonis
2014-08-13 11:12:20 +02:00
parent b49755b545
commit ff0ab6426a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/pivot_table.js
+5 -4
View File
@@ -423,14 +423,15 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
attrs.value = [attrs.value];
}
attrs.value = _.range(grouped_on.length).map(function (i) {
var grp = grouped_on[i],
field = self.fields[grp];
if (attrs.value[i] === false) {
return _t('Undefined');
} else if (attrs.value[i] instanceof Array) {
return attrs.value[i][1];
}else if (grouped_on && self.fields[grouped_on].type === 'selection'){
var selection = self.fields[grouped_on].selection;
var value_lookup = _.where(selection, {0:attrs.value[i]});
return value_lookup ? value_lookup[0][1] : _t('Undefined');
} else if (field && field.type === 'selection') {
var selected = _.where(field.selection, {0: attrs.value[i]})[0];
return selected ? selected[1] : attrs.value[i];
}
return attrs.value[i];
});