summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2020-03-18 11:30:46 +0000
committerRomain Derie <rde@odoo.com>2020-03-26 16:44:32 +0000
commita3fa70fd5f78cbdf5689b605784c790eb7274442 (patch)
tree109b390dda951f1fe5730099b17a024de0ac9484 /addons/website/static/src/js
parent313927de5ad9c66e225b811fd1e86981644d7dca (diff)
[FIX] website_event: restore edit menu choice
Website has a behavior that will ask you which menu you want to edit if you click on 'Edit Menu' in the topbar and there is more than one menu in the DOM. This is typically the case for the event pages where the event has its own menu on top of the website one. This event menu was not triggering that behavior since 5b563549fa6 where is was accidentally broken. closes odoo/odoo#48459 X-original-commit: 5c3c91e4a8da7b7b9f5e05f9c0ec5a6dea782d87 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com> Signed-off-by: Romain Derie <rdeodoo@users.noreply.github.com>
Diffstat (limited to 'addons/website/static/src/js')
-rw-r--r--addons/website/static/src/js/menu/content.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js
index 8f949441224..c568ca4b9d1 100644
--- a/addons/website/static/src/js/menu/content.js
+++ b/addons/website/static/src/js/menu/content.js
@@ -509,7 +509,8 @@ var SelectEditMenuDialog = weWidgets.Dialog.extend({
var self = this;
self.roots = [{id: null, name: _t("Top Menu")}];
$('[data-content_menu_id]').each(function () {
- self.roots.push({id: $(this).data('content_menu_id'), name: $(this).attr('name')});
+ // Remove name fallback in master
+ self.roots.push({id: $(this).data('content_menu_id'), name: $(this).attr('name') || $(this).data('menu_name')});
});
this._super(parent, _.extend({}, {
title: _t("Select a Menu"),