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

[REF] move the method displaydata to a better place in addon web_graph 

bzr revid: ged@openerp.com-20131113091807-cxmc4aaaswdmkfia
This commit is contained in:
Gery Debongnie 2013-11-13 10:18:07 +01:00
parent 8eeaca216d
commit 3c0445479b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,17 +38,6 @@ instance.web_graph.GraphView = instance.web.View.extend({
},
},
display_data : function () {
if (this.mode === 'pivot') {
this.chart_view.hide();
this.pivot_table.show();
} else {
this.pivot_table.hide();
this.chart_view.draw();
this.chart_view.show();
}
},
view_loading: function (fields_view_get) {
var self = this;
this.model = new instance.web.Model(fields_view_get.model, {group_by_no_leaf: true});
@ -79,6 +68,17 @@ instance.web_graph.GraphView = instance.web.View.extend({
return query_groups(this.model, view_fields, this.domain, this.groupbys);
},
display_data : function () {
if (this.mode === 'pivot') {
this.chart_view.hide();
this.pivot_table.show();
} else {
this.pivot_table.hide();
this.chart_view.draw();
this.chart_view.show();
}
},
do_search: function (domain, context, group_by) {
var self = this;
this.domain = new instance.web.CompoundDomain(domain);
@ -138,7 +138,7 @@ var PivotTable = BasicDataView.extend({
this.$el.empty();
var self = this;
var rows = '<tr><td class="graph_border">' +
var rows = '<tr><td class="graph_border"><i class="fa fa-sort-asc"></i> fa-sort-asc' +
this.fields[this.groupby[0]].string +
'</td><td class="graph_border">' +
this.measure_label +