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

[IMP] makes some small changes to improves backward compatibility in some edge cases (takes the first 'operator' as a measure instead of the last, ...) in graph view (addon web_graph) 

bzr revid: ged@openerp.com-20131224100942-jnrdjeb9lg7rx8d2
This commit is contained in:
Gery Debongnie 2013-12-24 11:09:42 +01:00
parent e844ba1040
commit db9cdb7eb0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web_graph/static/src/js/graph.js
View File

@ -76,7 +76,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
}
} else { // old style, kept for backward compatibility
if ('operator' in field.attrs) {
measure = field.attrs.name;
measure = (measure) ? measure : field.attrs.name;
} else {
self.default_row_groupby.push(field.attrs.name);
}
@ -95,6 +95,12 @@ instance.web_graph.GraphView = instance.web.View.extend({
options = {domain:domain};
this.search_view_groupby = group_by;
if (group_by.length && this.groupby_mode !== 'manual') {
if (_.isEqual(col_groupby, [])) {
col_groupby = this.default_col_groupby;
}
}
if (group_by.length || col_groupby.length) {
this.groupby_mode = 'manual';
}
@ -243,7 +249,6 @@ instance.web_graph.Graph = instance.web.Widget.extend({
.attr('href', '#')
.append(self.fields[measure].string);
measure_selection.append($('<li></li>').append(choice));
});
});
@ -572,7 +577,6 @@ instance.web_graph.Graph = instance.web.Widget.extend({
nv.addGraph(function () {
var chart = nv.models.multiBarChart()
.tooltips(false)
.width(self.width)
.height(self.height)
.stacked(self.bar_ui === 'stack')