diff options
| author | RomainLibert <rli@odoo.com> | 2018-07-03 15:34:32 +0200 |
|---|---|---|
| committer | RomainLibert <rli@odoo.com> | 2018-07-10 12:25:24 +0200 |
| commit | dc75248b89bcb6e839bcdf30830cdc5dbb9d80ec (patch) | |
| tree | 59249d1f8483dd306715eea200f817499b9c168c /addons/web/static/src/js/views | |
| parent | b87a95b6d6b846b660506a3f4ef3472ebc4df809 (diff) | |
[IMP] web: sort measures in graph view and pivot view
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/graph/graph_controller.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot/pivot_controller.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot/pivot_view.js | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views/graph/graph_controller.js b/addons/web/static/src/js/views/graph/graph_controller.js index e9f933023b1..e7f25c23fdd 100644 --- a/addons/web/static/src/js/views/graph/graph_controller.js +++ b/addons/web/static/src/js/views/graph/graph_controller.js @@ -88,7 +88,7 @@ var GraphController = AbstractController.extend(GroupByMenuInterfaceMixin,{ renderButtons: function ($node) { if ($node) { var context = { - measures: _.pairs(_.omit(this.measures, '__count__')), + measures: _.sortBy(_.pairs(_.omit(this.measures, '__count__')), function (x) { return x[0]; }), }; this.$buttons = $(qweb.render('GraphView.buttons', context)); this.$measureList = this.$buttons.find('.o_graph_measures_list'); diff --git a/addons/web/static/src/js/views/pivot/pivot_controller.js b/addons/web/static/src/js/views/pivot/pivot_controller.js index 5f31c7103c7..f0976c9a8b4 100644 --- a/addons/web/static/src/js/views/pivot/pivot_controller.js +++ b/addons/web/static/src/js/views/pivot/pivot_controller.js @@ -102,7 +102,7 @@ var PivotController = AbstractController.extend({ */ renderButtons: function ($node) { if ($node) { - var context = {measures: _.pairs(_.omit(this.measures, '__count'))}; + var context = {measures: _.sortBy(_.pairs(_.omit(this.measures, '__count')), function(x) { return x[0]; })}; this.$buttons = $(QWeb.render('PivotView.buttons', context)); this.$buttons.click(this._onButtonClick.bind(this)); this.$buttons.find('button').tooltip(); diff --git a/addons/web/static/src/js/views/pivot/pivot_view.js b/addons/web/static/src/js/views/pivot/pivot_view.js index 251fa10200d..643ee68a498 100644 --- a/addons/web/static/src/js/views/pivot/pivot_view.js +++ b/addons/web/static/src/js/views/pivot/pivot_view.js @@ -119,5 +119,3 @@ var PivotView = AbstractView.extend({ return PivotView; }); - - |