diff options
| author | Adrien Dieudonne <adr@odoo.com> | 2018-07-06 15:08:43 +0200 |
|---|---|---|
| committer | Adrien Dieudonne <adr@odoo.com> | 2018-07-06 15:39:06 +0200 |
| commit | a548e77b6f9f4e46da3c2ad594ebd87cd481e004 (patch) | |
| tree | 01969355875926a0303384bb7b6d75d57397b4ce /addons/web/static/src | |
| parent | dc1904d3abdb63385363719f894bff04c764a2b4 (diff) | |
[FIX] web: groups of filters ordered correctly
In the filters menus, the order of groups of filters comming
from the search view arch was not always preserved in the filters menu.
This commit fixes that situation.
forward-port of @4094f755
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/search/groupby_menu_interface_mixin.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/dropdown_menu.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/search/groupby_menu_interface_mixin.js b/addons/web/static/src/js/views/search/groupby_menu_interface_mixin.js index 9e0e1621c27..d782eb99015 100644 --- a/addons/web/static/src/js/views/search/groupby_menu_interface_mixin.js +++ b/addons/web/static/src/js/views/search/groupby_menu_interface_mixin.js @@ -54,6 +54,7 @@ var GroupByMenuInterfaceMixin = { defaultOptionId: groupby ? groupby.interval : false, }); }); + groupbys = _.sortBy(groupbys, 'description'); var groupByMenu = new GroupByMenu(this, groupbys, groupableFields, {headerStyle: 'primary'}); groupByMenu.insertAfter($node.find('div:first')); }, diff --git a/addons/web/static/src/js/widgets/dropdown_menu.js b/addons/web/static/src/js/widgets/dropdown_menu.js index 335eed80e0e..6fb8aab9bb4 100644 --- a/addons/web/static/src/js/widgets/dropdown_menu.js +++ b/addons/web/static/src/js/widgets/dropdown_menu.js @@ -52,7 +52,7 @@ var DropdownMenu = Widget.extend({ el: {class: 'btn-group o_dropdown', attrs: {}}, mainButton: {class: 'o_dropdown_toggler_btn btn btn-sm btn-default dropdown-toggle'}, }; - this.items = _.sortBy(items, 'groupId'); + this.items = items; _.each(this.items, this._prepareItem.bind(this)); }, /** |
