diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
| commit | a6b25061ba461c12b22a8945e43134a0bc79d5ee (patch) | |
| tree | 60b5e702f1f31324e36d2d51b7b1b777994b2cb4 /addons/web_graph | |
| parent | 1f693aaed6f6e28a384f20d357f8a3f558d33f6a (diff) | |
| parent | 7dedde91eff41752724efcbbefa5e0ca7e1ae3e0 (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140430085942-umusyhp4cs2ffezj
bzr revid: ged@openerp.com-20140430140423-kq0vdboq1mux4zfn
Diffstat (limited to 'addons/web_graph')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_widget.js | 15 | ||||
| -rw-r--r-- | addons/web_graph/static/src/xml/web_graph.xml | 3 |
2 files changed, 6 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 84ca75ddda2..ce73a0b51c6 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; diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml index 4522fd2504f..81804e5a9b1 100644 --- a/addons/web_graph/static/src/xml/web_graph.xml +++ b/addons/web_graph/static/src/xml/web_graph.xml @@ -35,6 +35,9 @@ <label class="btn btn-default" data-choice="swap_axis" title="Swap Axis"> <span class="fa fa-expand"></span> </label> + <label class="btn btn-default" data-choice="expand_all" title="Expand All"> + <span class="fa fa-arrows-alt"></span> + </label> <label class="btn btn-default" data-choice="update_values" title="Reload Data"> <span class="fa fa-refresh"></span> </label> |