diff options
| author | Thomas Werland <twe@odoo.com> | 2019-05-17 10:14:39 +0000 |
|---|---|---|
| committer | Mathieu Duckerts-Antoine <dam@odoo.com> | 2019-07-16 07:55:04 +0000 |
| commit | 150bd2b948e076037fab1b4f9386808d87fa00e5 (patch) | |
| tree | 2666660ea68143827f11cd82f099d43984d8403b /addons/web/static | |
| parent | ba1f4dc381dc412cfbed84831bedd1af704d2ff2 (diff) | |
[FIX] web: fix Groupby menu style in embedded graph views
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph/graph_controller.js | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js index dc7a5dc3cc8..bfe1720496a 100644 --- a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js +++ b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js @@ -36,6 +36,7 @@ var GroupByMenuMixin = { * private * @param {jQuery} $node * @param {Object} groupableFields + * @param {Promise} */ _addGroupByMenu: function ($node, groupableFields) { this.sortedFieldNames = _.sortBy(Object.keys(groupableFields), function (fieldName) { @@ -44,7 +45,7 @@ var GroupByMenuMixin = { this.groupableFields = groupableFields; var groupBys = this._getGroupBys(this.model.get().groupBy); this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields); - this.groupByMenu.insertAfter($node.find('div:first')); + return this.groupByMenu.insertAfter($node.find('div:first')); }, /** * This method puts the active groupBys in a convenient form. 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 9e2ebfc0a78..1c580a25bd6 100644 --- a/addons/web/static/src/js/views/graph/graph_controller.js +++ b/addons/web/static/src/js/views/graph/graph_controller.js @@ -96,8 +96,13 @@ var GraphController = AbstractController.extend(GroupByMenuMixin,{ this._updateButtons(); this.$buttons.appendTo($node); if (this.isEmbedded) { - this._addGroupByMenu($node, this.groupableFields); + this._addGroupByMenu($node, this.groupableFields).then(function(){ + var groupByButton = $node.find('.o_dropdown_toggler_btn'); + groupByButton.removeClass("o_dropdown_toggler_btn btn btn-secondary dropdown-toggle"); + groupByButton.addClass("btn dropdown-toggle btn-outline-secondary"); + }); } + } }, |