diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index b54e5e0afb3f7..0c05eccd3a8bb 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -282,7 +282,6 @@ def generate_views(action): # providing at least one view mode is a requirement, not an option view_modes = action['view_mode'].split(',') - # BLUE STINGRAY / METRIC WISE CUSTOM # make sure the view_description is instantiated view_description = action['view_description'] or False diff --git a/addons/web/static/src/legacy/js/chrome/abstract_action.js b/addons/web/static/src/legacy/js/chrome/abstract_action.js index fd539ac0e47ca..972c414b7afda 100644 --- a/addons/web/static/src/legacy/js/chrome/abstract_action.js +++ b/addons/web/static/src/legacy/js/chrome/abstract_action.js @@ -50,17 +50,6 @@ const AbstractAction = Widget.extend(ActionMixin, { */ withSearchBar: false, - /** - * BLUE STINGRAY / METRIC WISE CUSTOM - * A client action might want to see the view description displayed in its - * control panel, or it choose not to use it. - * - * It also only makes sense if hasControlPanel is set to true. - * - * @type boolean - */ - withViewDescription: false, - /** * This parameter can be set to customize the available sub menus in the * controlpanel (Filters/Group By/Favorites). This is basically a list of @@ -98,7 +87,6 @@ const AbstractAction = Widget.extend(ActionMixin, { this.extensions.ControlPanel = { actionId: action.id, withSearchBar: this.withSearchBar, - withViewDescription: this.withViewDescription, }; this.viewId = action.search_view_id && action.search_view_id[0]; @@ -108,7 +96,6 @@ const AbstractAction = Widget.extend(ActionMixin, { breadcrumbs: options && options.breadcrumbs, withSearchBar: this.withSearchBar, searchMenuTypes: this.searchMenuTypes, - withViewDescription: this.withViewDescription, }; } }, diff --git a/addons/web/static/src/legacy/js/chrome/action_mixin.js b/addons/web/static/src/legacy/js/chrome/action_mixin.js index 9a121d66a9d70..ba126b6cd90fe 100644 --- a/addons/web/static/src/legacy/js/chrome/action_mixin.js +++ b/addons/web/static/src/legacy/js/chrome/action_mixin.js @@ -66,7 +66,6 @@ odoo.define('web.ActionMixin', function (require) { _title: '', /** - * BLUE STINGRAY / METRIC WISE CUSTOM * String containing the view description of the client action * * @see _setViewDescription @@ -163,7 +162,6 @@ odoo.define('web.ActionMixin', function (require) { }, /** - * BLUE STINGRAY / METRIC WISE CUSTOM * Returns a view_description that may be displayed in center of the * control panel area. * diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js index 3b35aae782ea9..90ae5d7b67cd3 100644 --- a/addons/web/static/src/search/control_panel/control_panel.js +++ b/addons/web/static/src/search/control_panel/control_panel.js @@ -39,8 +39,8 @@ export class ControlPanel extends Component { const originalSlots = {}; const transferredSlotNames = [ "control-panel-top-left", - "control-panel-top-right", "control-panel-top-center", + "control-panel-top-right", "control-panel-bottom-left", "control-panel-bottom-right", ]; @@ -67,15 +67,14 @@ export class ControlPanel extends Component { const display = Object.assign( { "top-left": true, - "top-center":true, + "top-center": true, "top-right": true, "bottom-left": true, "bottom-right": true, }, this.props.display || this.env.searchModel.display.controlPanel ); - display.top = display["top-left"] || display["top-center"] || - display["top-right"]; + display.top = display["top-left"] || display["top-center"] || display["top-right"]; display.bottom = display["bottom-left"] || display["bottom-right"]; return display; } diff --git a/addons/web/static/src/search/control_panel/control_panel.xml b/addons/web/static/src/search/control_panel/control_panel.xml index efef6446d3869..968d929b75dae 100644 --- a/addons/web/static/src/search/control_panel/control_panel.xml +++ b/addons/web/static/src/search/control_panel/control_panel.xml @@ -11,10 +11,8 @@