From a67553c9d2a7a5fcb28e44a5fbd5c245d851b91d Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Mon, 26 Nov 2018 13:21:29 +0000
Subject: [PATCH] [FIX] website_event: website menu on event not working

Commit 7077f18e3 tried to fix the website event menu issue.
But the fix was wrong and fixed only the event having a website_id set.
After the 7077f18e3 fix, event with a website_id set are working as expected
but the ones without a website_id are not working.
Indeed, it will create a website.menu without a website_id which will result in
the menu being duplicated for each website (multi-website rule).
The required on website_id when activating website menu on event was trying to
hide that new issue but it was problematic since:
1. We were removing a feature for no reason as it would not be possible anymore
   to create a generic event (no website) with website menu activated.
2. The required would only work in form view, demo data or custo data loaded
   through xml without a website_id but having website menu activated would
   still bug and would not have a menu. Worst, the menu would be duplicated for
   every website and added to the website navbar.

Now, regardless of the event having a website_id set or not, activating or
deactivating event menu will work.

closes odoo/odoo#29036
---
 addons/website/models/website.py           | 2 +-
 addons/website_event/views/event_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index c592ad32b57..968e01848e1 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1100,7 +1100,7 @@ class Menu(models.Model):
         if vals.get('url') == '/default-main-menu':
             return super(Menu, self).create(vals)
 
-        if vals.get('website_id'):
+        if 'website_id' in vals:
             return super(Menu, self).create(vals)
         elif self._context.get('website_id'):
             vals['website_id'] = self._context.get('website_id')
diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_views.xml
index 566a391772a..7e4df97c36a 100644
--- a/addons/website_event/views/event_views.xml
+++ b/addons/website_event/views/event_views.xml
@@ -31,7 +31,7 @@
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
             <field name="organizer_id" position="before">
-                <field name="website_id" options="{'no_create': True}"  attrs="{'required': [('website_menu','=',True)]}" groups="website.group_multi_website"/>
+                <field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>
             </field>
             <button name="toggle_active" position="before">
                 <field name="website_url" invisible="1"/>