diff options
| author | Simon Lejeune <sle@openerp.com> | 2014-04-29 14:42:37 +0200 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2014-04-29 14:42:37 +0200 |
| commit | 6bef64f513ee744ac016e2dd98e9e29bad947f94 (patch) | |
| tree | 5613064dcf2c9e7558f8a4010930fbb025457d9a /addons/web_graph/static/src/js/graph_widget.js | |
| parent | 545e8ae52923ba7f0daa8810036a3a169c32cf6a (diff) | |
| parent | 6f51331d52bed117f5a060addf4ee12608ea2236 (diff) | |
[MERGE] trunk
bzr revid: sle@openerp.com-20140422123804-dnjnwfyfrpxjgrlo
bzr revid: sle@openerp.com-20140424124720-ihcrqojmnmj0k66q
bzr revid: sle@openerp.com-20140428162227-sbvq5ogtshpz0vw6
bzr revid: sle@openerp.com-20140429124237-dhk3378fvche068v
Diffstat (limited to 'addons/web_graph/static/src/js/graph_widget.js')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_widget.js | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js index 317ea6cbfb9..923b488d17a 100644 --- a/addons/web_graph/static/src/js/graph_widget.js +++ b/addons/web_graph/static/src/js/graph_widget.js @@ -260,21 +260,12 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ option_selection: function (event) { event.preventDefault(); switch (event.currentTarget.getAttribute('data-choice')) { - case 'bar_grouped': - this.bar_ui = 'group'; - if (this.mode === 'bar') { - this.display_data(); - } - break; - case 'bar_stacked': - this.bar_ui = 'stack'; - if (this.mode === 'bar') { - this.display_data(); - } - break; case 'swap_axis': this.swap_axis(); break; + case 'expand_all': + this.pivot.expand_all().then(this.proxy('display_data')); + break; case 'update_values': this.pivot.update_data().then(this.proxy('display_data')); break; |