diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d08ff3c7491..7a4b59bc68e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -837,7 +837,8 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ init: function(parent, element_id, secondary_menu_id) { this._super(parent, element_id); this.secondary_menu_id = secondary_menu_id; - this.$secondary_menu = $("#" + secondary_menu_id).hide(); + this.$secondary_menu = $("#" + secondary_menu_id); + this.$secondary_menu.hide(); this.menu = false; this.folded = false; if (window.localStorage) { @@ -911,7 +912,10 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ sub_menu_visible = $sub_menu.is(':visible'); this.$secondary_menu.find('.oe_secondary_menu').hide(); - $('.active', this.$element.add(this.$secondary_menu.show())).removeClass('active'); + if (this.$secondary_menu.hasClass('oe_folded')) { + this.$secondary_menu.show(); + } + $('.active', this.$element.add(this.$secondary_menu)).removeClass('active'); $main_menu.add($clicked_menu).add($sub_menu).addClass('active'); if (!(this.folded && manual)) { diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index e79ccf7b4b6..07c9f83ef1f 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -376,8 +376,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ template: 'ApplicationTiles', start: function () { this._super(); + $('.secondary_menu', this.$element.closest('.openerp')).hide(); return this.do_display_root_menu(); }, + stop: function () { + $('.secondary_menu', this.$element.closest('.openerp')).show(); + this._super(); + }, do_display_root_menu: function() { var self = this; return new openerp.web.DataSetSearch( this, 'ir.ui.menu', null, [['parent_id', '=', false]])