From 3c0445479bf5ceaab5bb2b6f201daa787c53bb82 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 13 Nov 2013 10:18:07 +0100 Subject: [PATCH] [REF] move the method displaydata to a better place in addon web_graph bzr revid: ged@openerp.com-20131113091807-cxmc4aaaswdmkfia --- addons/web_graph/static/src/js/graph.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 44152e45372..7ade3843bde 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -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 = '' + + var rows = ' fa-sort-asc' + this.fields[this.groupby[0]].string + '' + this.measure_label +