diff options
| author | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-22 12:52:43 +0100 |
|---|---|---|
| committer | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-22 12:52:43 +0100 |
| commit | 7b2ece8ddc6712af1582dab7c4050cd680d69c36 (patch) | |
| tree | d3fee08c2be9645aff5b29a8e90b430360ac2cdc /addons/web_graph/static/src | |
| parent | b3f7278d12a9409a112b5a4f8ef7ef182ef6538d (diff) | |
| parent | e6e2a6f7db438b46e19944cbd591691a3bc2e0e6 (diff) | |
merge
bzr revid: rlo@openerp.com-20111222115243-ht5rqa4j5bl7ie96
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 59f56328ffa..e63eec884cd 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -173,7 +173,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ graph_data = _(graph_data).sortBy(function (point) { return point[self.abscissa] + '[[--]]' + point[self.group_field]; }); - if (this.chart == 'bar' || 'line' || 'area') { + if (_.include(['bar','line','area'],this.chart)) { return this.schedule_bar_line_area(graph_data); } else if (this.chart == "pie") { return this.schedule_pie(graph_data); |