diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-02-09 11:32:16 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-02-09 11:32:16 +0530 |
| commit | f5e2fe1ff02f37088bce73b39fdf7328e568aa1a (patch) | |
| tree | afdf585c2ed8600b314637f89e7a6bc0bbdd6823 /addons/web_graph/static/src | |
| parent | a9aaad2257ae9b61729757007ef59db41f8521f4 (diff) | |
| parent | 98bd34a2eb74d5226279795014c178c08aec4ee6 (diff) | |
[Merge] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20120209060216-7srqio91yxlu7yi0
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index f153a2155f0..966f3c1b006 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -97,7 +97,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ this.$element.html(QWeb.render("GraphView", { "fields_view": this.fields_view, "chart": this.chart, - 'element_id': this.element_id + 'element_id': this.widget_parent.element_id })); var fields = _(this.columns).pluck('name').concat([this.abscissa]); @@ -267,7 +267,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ self.renderer = null; var charts = new dhtmlXChart({ view: view_chart, - container: self.element_id+"-"+self.chart+"chart", + container: self.widget_parent.element_id+"-"+self.chart+"chart", value:"#"+group_list[0].group+"#", gradient: (self.chart == "bar") ? "3d" : "light", alpha: (self.chart == "area") ? 0.6 : 1, @@ -304,6 +304,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ } } }); + self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width( + self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width()+120); for (var m = 1; m<group_list.length;m++){ var column = group_list[m]; @@ -326,8 +328,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ }); } charts.parse(results, "json"); - self.$element.find("#"+self.element_id+"-"+self.chart+"chart").height( - self.$element.find("#"+self.element_id+"-"+self.chart+"chart").height()+50); + self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height( + self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height()+50); charts.attachEvent("onItemClick", function(id) { self.open_list_view(charts.get(id)); }); |