From 1163013ed6bf191a9e1548866a4df699f72b5bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 20 Aug 2020 09:16:38 +0000 Subject: [REM] website_event_track_online: merge into website_event_track PURPOSE Clean organization and models linked to Event Online feature introduced in semi stable saas-13.3 at odoo/odoo@981f95bbf46658eda9f2d33751b9310cc67d86aa and odoo/enterprise@14722028ae0773c3710ea48ce48ff44703e83b5a Also clean website event menu not being available in website event but only in website event track, which implies some extra-code to manage it. In short: merge website_event_online in website_event, website_event_track _(online/session) in website_event_track. RATIONALE _online modules have been added to extend content of website_event and website_event_track without having any impact on those module. First step of cleaning is to move this content directly in base module. track_session module is mainly a rewrite of track module. Second step of cleaning is to move its content directly in website_event_track. SPECIFICATIONS Move remaining content of website event track online to website event track. Agenda notably is completely replaced by the new one developed within track_online module. Update dependencies accordingly. LINKS Task ID-2319779 COM odoo/odoo#56067 ENT odoo/enterprise#12520 UPG odoo/upgrade#1654 --- addons/website_event_track_live/__manifest__.py | 2 +- addons/website_event_track_live/controllers/track_live.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/website_event_track_live') diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py index 8f137e270e2..3574deefbc9 100644 --- a/addons/website_event_track_live/__manifest__.py +++ b/addons/website_event_track_live/__manifest__.py @@ -11,7 +11,7 @@ 'website': 'https://www.odoo.com/page/events', 'description': "", 'depends': [ - 'website_event_track_online', + 'website_event_track', 'website_event_track_session', ], 'data': [ diff --git a/addons/website_event_track_live/controllers/track_live.py b/addons/website_event_track_live/controllers/track_live.py index d85d3d13c79..1fcbba24fec 100644 --- a/addons/website_event_track_live/controllers/track_live.py +++ b/addons/website_event_track_live/controllers/track_live.py @@ -3,10 +3,10 @@ from odoo import http -from odoo.addons.website_event_track_online.controllers.event_track import EventTrackOnlineController +from odoo.addons.website_event_track.controllers.event_track import EventTrackController -class EventTrackLiveController(EventTrackOnlineController): +class EventTrackLiveController(EventTrackController): @http.route('/event_track/get_track_suggestion', type='json', auth='public', website=True) def get_next_track_suggestion(self, track_id): -- cgit v1.2.3