From 9932646386cc0968d316a1a9e9786051061bcfcc Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 14 Jul 2011 15:25:19 +0530 Subject: [FIX]Apply domain and context on dashboard graph. bzr revid: kch@tinyerp.com-20110714095519-i0a0936hen9qidh3 --- addons/base_graph/static/src/js/graph.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'addons/base_graph/static/src/js/graph.js') diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index 6f1e3a89253..3e45d3f70a5 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -76,11 +76,19 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ load_chart: function(data) { var self = this; + var domain = false; if(data){ this.x_title = this.all_fields[this.chart_info_fields]['string']; this.y_title = this.all_fields[this.operator_field]['string']; self.schedule_chart(data); }else{ + if(! _.isEmpty(this.view_manager.dataset.domain)){ + domain = this.view_manager.dataset.domain; + }else if(! _.isEmpty(this.view_manager.action.domain)){ + domain = this.view_manager.action.domain; + } + this.dataset.domain = domain; + this.dataset.context = this.view_manager.dataset.context; this.dataset.read_slice(this.fields, 0, false, function(res) { self.schedule_chart(res); }); -- cgit v1.2.3 From 55954197d81f79a4776932ab27f40b58832579e8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 20 Jul 2011 10:14:15 +0200 Subject: [FIX] initial loading of graph after view switches: fields argument to DataSet.read_slice has to be an array of strings providing an object does not work bzr revid: xmo@openerp.com-20110720081415-5fsk44p04x6i6et7 --- addons/base_graph/static/src/js/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/base_graph/static/src/js/graph.js') diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index 3e45d3f70a5..b9115e79088 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -89,7 +89,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ } this.dataset.domain = domain; this.dataset.context = this.view_manager.dataset.context; - this.dataset.read_slice(this.fields, 0, false, function(res) { + this.dataset.read_slice(_(this.fields).keys(), 0, false, function(res) { self.schedule_chart(res); }); } -- cgit v1.2.3