diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js index 39634ff103a..1122089f060 100644 --- a/addons/web_graph/static/src/js/graph_view.js +++ b/addons/web_graph/static/src/js/graph_view.js @@ -47,23 +47,27 @@ instance.web_graph.GraphView = instance.web.View.extend({ }; _.each(arch.children, function (field) { + var field_name = field.attrs.name; + if (_.has(field.attrs, 'interval')) { + field_name = field.attrs.name + ':' + field.attrs.interval; + } if (_.has(field.attrs, 'type')) { switch (field.attrs.type) { case 'row': - self.widget_config.row_groupby.push(field.attrs.name); + self.widget_config.row_groupby.push(field_name); break; case 'col': - self.widget_config.col_groupby.push(field.attrs.name); + self.widget_config.col_groupby.push(field_name); break; case 'measure': - self.widget_config.measures.push(field.attrs.name); + self.widget_config.measures.push(field_name); break; } } else { // old style, kept for backward compatibility if ('operator' in field.attrs) { - self.widget_config.measures.push(field.attrs.name); + self.widget_config.measures.push(field_name); } else { - self.widget_config.row_groupby.push(field.attrs.name); + self.widget_config.row_groupby.push(field_name); } } }); diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js index 64b163e883d..d9fd73924ee 100644 --- a/addons/web_graph/static/src/js/graph_widget.js +++ b/addons/web_graph/static/src/js/graph_widget.js @@ -281,6 +281,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ if (!this.important_fields.length) { return; } + var fields = _.map(this.important_fields, function (field) { return {id: field.field, value: field.string, type:self.fields[field.field].type}; });