summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duckerts-Antoine <dam@odoo.com>2019-05-23 15:15:57 +0000
committerMathieu Duckerts-Antoine <dam@odoo.com>2019-07-16 07:55:04 +0000
commita87cbcadbced018f4dafdf8a48c56f9e7e36b668 (patch)
treed103ef9354f33e48f0d0c2a52ffff1ad383524ef
parent150bd2b948e076037fab1b4f9386808d87fa00e5 (diff)
[FIX] web: appropriate symbol in mobile embedded graph view groupby menu
-rw-r--r--addons/web/static/src/js/views/control_panel/search/groupby_menu.js5
-rw-r--r--addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js2
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/control_panel/search/groupby_menu.js b/addons/web/static/src/js/views/control_panel/search/groupby_menu.js
index b67bf9ee75d..fac67beb3f4 100644
--- a/addons/web/static/src/js/views/control_panel/search/groupby_menu.js
+++ b/addons/web/static/src/js/views/control_panel/search/groupby_menu.js
@@ -41,6 +41,7 @@ var GroupByMenu = DropdownMenu.extend({
*/
init: function (parent, groupBys, fields, options) {
var self = this;
+ options = options || {};
this._super(parent, groupBys);
this.fields = fields;
// determines when the 'Add custom groupby' submenu is open
@@ -65,9 +66,9 @@ var GroupByMenu = DropdownMenu.extend({
this.dropdownCategory = 'groupby';
this.dropdownTitle = _t('Group By');
this.dropdownIcon = 'fa fa-bars';
- this.dropdownSymbol = this.isMobile ? 'fa fa-chevron-right float-right mt4' : false;
+ this.dropdownSymbol = this.isMobile && !options.noSymbol ? 'fa fa-chevron-right float-right mt4' : false;
// the default style of the groupby menu can be changed here using the options key 'headerStyle'
- if (options && options.headerStyle === 'primary') {
+ if (options.headerStyle === 'primary') {
this.dropdownStyle = {
el: {class: 'btn-group o_group_by_menu o_dropdown', attrs: {'role': 'group'}},
mainButton: {class: 'btn btn-primary dropdown-toggle'},
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 bfe1720496a..c9a17d6225e 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
@@ -44,7 +44,7 @@ var GroupByMenuMixin = {
});
this.groupableFields = groupableFields;
var groupBys = this._getGroupBys(this.model.get().groupBy);
- this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields);
+ this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields, {noSymbol: true});
return this.groupByMenu.insertAfter($node.find('div:first'));
},
/**