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

[FIX] prevents a crash happening in some cases when the searchview does not initialize a groupbygroup instance before the method register_groupby in graph view used it (addon web_graph) 

bzr revid: ged@openerp.com-20131220123925-qycdvanm51nkc4uo
This commit is contained in:
Gery Debongnie 2013-12-20 13:39:25 +01:00
parent 828d06f174
commit e844ba1040
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
query = this.search_view.query;
this.groupby_mode = 'manual';
if (_.isEqual(this.search_view_groupby, this.graph_widget.pivot.rows.groupby)) {
if (_.isEqual(this.search_view_groupby, this.graph_widget.pivot.rows.groupby) ||
(!_.has(this.search_view, '_s_groupby'))) {
return;
}
var rows = _.map(this.graph_widget.pivot.rows.groupby, function (group) {
@ -340,6 +341,9 @@ instance.web_graph.Graph = instance.web.Widget.extend({
var field = header.root.groupby[header.path.length];
this.pivot.expand(id, field);
} else {
if (!this.important_fields.length) {
return;
}
var fields = _.map(this.important_fields, function (field) {
return {id: field, value: self.fields[field].string};
});