From 3daed421f4c06ce0851efb8eab0071b7fc002bff Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 28 Aug 2019 15:41:22 +0000
Subject: [FIX] website: restore edit menu dialog

Since saas-12.5, with recent ORM changes, writing on non-existing fields
does not trigger a warning anymore but instead crashes. This revealed
that the 12.0 "Edit Menu" dialog was doing some of that. Indeed,
depending on what was edited, we ended up writing on the 'is_homepage'
field, the 'text' field, the 'isNewWindow' field, ... which do not
exist.

This commit takes advantage of the fix to also lint the dialog code and
convert some of it to ES6.

Discovered while working on task-1925319

closes odoo/odoo#36204

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/website/static/src/xml/website.contentMenu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml/website.contentMenu.xml')

diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index edf166b946d..9c938c38847 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
 <t t-name="website.contentMenu.dialog.submenu">
-    <li t-att-data-menu-id="submenu.id">
+    <li t-att-data-menu-id="submenu.fields['id']">
         <div class="input-group">
             <div class="input-group-prepend">
                 <span class="input-group-text fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/>
             </div>
             <span class="form-control d-flex align-items-center">
                 <span class="js_menu_label o_text_overflow flex-grow-1">
-                    <t t-esc="submenu.name"/>
+                    <t t-esc="submenu.fields['name']"/>
                 </span>
                 <i t-if="submenu.is_homepage" class="fa fa-home ml-3" role="img" aria-label="Home" title="Home"/>
             </span>
-- 
cgit v1.2.3


From 1345702258adbfbee0d780dc22e552395e6d1df7 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 28 Aug 2019 09:33:20 +0000
Subject: [IMP] website: add the ability to create mega menus

Allow users to create complex website menus, also known as "mega menus".
Mega menus are enabled individually via the edit menu dialog, then their
content can be customized by dragging snippets in them like any other
snippets area in edit mode.

task-1925319

closes odoo/odoo#36097

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>


Co-authored-by: Andrea Ulliana <aul@odoo.com>
---
 addons/website/static/src/xml/website.contentMenu.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.contentMenu.xml')

diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index 9c938c38847..af318703b5c 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
 <t t-name="website.contentMenu.dialog.submenu">
-    <li t-att-data-menu-id="submenu.fields['id']">
+    <li t-att-data-menu-id="submenu.fields['id']" t-att-data-mega-menu="submenu.fields['is_mega_menu'] ? true : undefined">
         <div class="input-group">
             <div class="input-group-prepend">
                 <span class="input-group-text fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/>
@@ -10,6 +10,7 @@
                 <span class="js_menu_label o_text_overflow flex-grow-1">
                     <t t-esc="submenu.fields['name']"/>
                 </span>
+                <span t-if="submenu.fields['is_mega_menu']" class="badge badge-primary">Mega Menu</span>
                 <i t-if="submenu.is_homepage" class="fa fa-home ml-3" role="img" aria-label="Home" title="Home"/>
             </span>
             <span class="input-group-append">
@@ -49,6 +50,9 @@
         </small>
         <a href="#" class="js_add_menu">
             <i class="fa fa-plus-circle"/> Add Menu Item
+        </a><br/>
+        <a href="#" class="js_add_menu" data-type="mega">
+            <i class="fa fa-plus-circle"/> Add Mega Menu Item
         </a>
     </div>
 </div>
-- 
cgit v1.2.3