From 524324ae4e4ec21b58d2d3a89340d1d36173b260 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Fri, 24 Jan 2014 13:59:44 +0100 Subject: [FIX] fixes two small issues concerning the groupby dates in graph view (addon web_graph) bzr revid: ged@openerp.com-20140124125944-wxl4zdya37pxdnqv --- addons/web_graph/static/src/js/pivot_table.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_graph/static/src/js/pivot_table.js') diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js index f47fcabc92e..d5c01765504 100644 --- a/addons/web_graph/static/src/js/pivot_table.js +++ b/addons/web_graph/static/src/js/pivot_table.js @@ -402,12 +402,12 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ value = attrs.value, grouped_on = attrs.grouped_on ? this.raw_field(attrs.grouped_on) : false; - if (grouped_on && this.fields[grouped_on].type === 'selection') { + if (value === false) { + group.attributes.value = 'undefined'; + } else if (grouped_on && this.fields[grouped_on].type === 'selection') { var selection = this.fields[grouped_on].selection, value_lookup = _.where(selection, {0:value}); group.attributes.value = value_lookup ? value_lookup[0][1] : 'undefined'; - } else if (value === false) { - group.attributes.value = 'undefined'; } else if (value instanceof Array) { group.attributes.value = value[1]; } -- cgit v1.2.3