diff options
| author | Thibault Delavallée <tde@odoo.com> | 2020-08-21 09:05:42 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-08-24 10:16:48 +0000 |
| commit | ee806a01029a10ef5802aac0a22241b3c1158100 (patch) | |
| tree | c473bbbec8bf7f4edfeafb6fd90d5e8c8a588f14 /addons/website_event | |
| parent | db4eda03849599f22277af00565aac603c747a2e (diff) | |
[FIX] website_event_track(_online): fix track menu computation
This commit fixes glitches when switching menus. Indeed agenda is not correctly
taken into account, meaning it could get duplicated. Moreover track was
constantly coming back as True event when not wanted.
Behavior is: when setting website menu, force it to True, otherwise let users
defined its value. Agenda is part of track menu so fix its declaration in
_track and _track_online methods.
Task ID-2314778 (event online fixes)
PR #56340
PR odoo/enterprise#12589
X-Original-PR #56254
X-Original-Commit odoo/odoo@5821758c4db480a4c94b7a73c18216bed1c07394
Diffstat (limited to 'addons/website_event')
| -rw-r--r-- | addons/website_event/models/event_event.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_event/models/event_event.py b/addons/website_event/models/event_event.py index 72f8096b5a1..f897d2eaffd 100644 --- a/addons/website_event/models/event_event.py +++ b/addons/website_event/models/event_event.py @@ -118,7 +118,7 @@ class Event(models.Model): for event in self: if event.event_type_id and event.event_type_id != event._origin.event_type_id: event.community_menu = event.event_type_id.community_menu - elif event.website_menu and event.website_menu != event._origin.website_menu or not event.community_menu: + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.community_menu): event.community_menu = True elif not event.website_menu: event.community_menu = False @@ -129,7 +129,7 @@ class Event(models.Model): for event in self: if event.event_type_id and event.event_type_id != event._origin.event_type_id: event.menu_register_cta = event.event_type_id.menu_register_cta - elif event.website_menu and event.website_menu != event._origin.website_menu or not event.menu_register_cta: + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.menu_register_cta): event.menu_register_cta = True elif not event.website_menu: event.menu_register_cta = False |