diff --git a/addons/event/views/event_tag_views.xml b/addons/event/views/event_tag_views.xml index 310d32a2d62..b7367350a60 100644 --- a/addons/event/views/event_tag_views.xml +++ b/addons/event/views/event_tag_views.xml @@ -58,7 +58,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py index deca5b82364..aec751560fc 100644 --- a/addons/website_event/__manifest__.py +++ b/addons/website_event/__manifest__.py @@ -31,6 +31,7 @@ 'views/event_question_views.xml', 'views/event_registration_answer_views.xml', 'views/event_tag_category_views.xml', + 'views/event_tag_views.xml', 'views/event_type_views.xml', 'views/website_event_menu_views.xml', 'views/website_visitor_views.xml', diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 196ee0758b7..70f58f17930 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -117,7 +117,9 @@ class WebsiteEventController(http.Controller): 'current_type': current_type, 'event_ids': events, # event_ids used in website_event_track so we keep name as it is 'dates': dates, - 'categories': request.env['event.tag.category'].search([('is_published', '=', True)]), + 'categories': request.env['event.tag.category'].search([ + ('is_published', '=', True), '|', ('website_id', '=', website.id), ('website_id', '=', False) + ]), 'countries': countries, 'pager': pager, 'searches': searches, @@ -125,6 +127,7 @@ class WebsiteEventController(http.Controller): 'keep': keep, 'search_count': event_count, 'original_search': fuzzy_search_term and search, + 'website': website } if searches['date'] == 'old': diff --git a/addons/website_event/models/__init__.py b/addons/website_event/models/__init__.py index d18c42893cd..c7cc99e9b9c 100644 --- a/addons/website_event/models/__init__.py +++ b/addons/website_event/models/__init__.py @@ -7,6 +7,7 @@ from . import event_question_answer from . import event_registration from . import event_registration_answer from . import event_tag_category +from . import event_tag from . import event_type from . import website from . import website_event_menu diff --git a/addons/website_event/models/event_tag.py b/addons/website_event/models/event_tag.py new file mode 100644 index 00000000000..88ff1b304a1 --- /dev/null +++ b/addons/website_event/models/event_tag.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models + + +class EventTag(models.Model): + _name = 'event.tag' + _inherit = ['event.tag', 'website.published.multi.mixin'] + + def default_get(self, fields_list): + result = super().default_get(fields_list) + if self.env.context.get('default_website_id'): + result['website_id'] = self.env.context.get('default_website_id') + return result diff --git a/addons/website_event/models/event_tag_category.py b/addons/website_event/models/event_tag_category.py index 713d703b3f9..29d059a28b3 100644 --- a/addons/website_event/models/event_tag_category.py +++ b/addons/website_event/models/event_tag_category.py @@ -6,7 +6,7 @@ from odoo import models class EventTagCategory(models.Model): _name = 'event.tag.category' - _inherit = ['event.tag.category', 'website.published.mixin'] + _inherit = ['event.tag.category', 'website.published.multi.mixin'] def _default_is_published(self): return True diff --git a/addons/website_event/views/event_event_views.xml b/addons/website_event/views/event_event_views.xml index 56fe49c5a3c..8035cd29a25 100644 --- a/addons/website_event/views/event_event_views.xml +++ b/addons/website_event/views/event_event_views.xml @@ -8,8 +8,13 @@ + + + {'default_website_id': website_id} + website.group_multi_website +
@@ -74,6 +79,16 @@ + + + ['|', ('category_id.website_id', '=', website_id), ('category_id.website_id', '=', False)] + {'invisible': [('website_id', '=', False)]} + + + + + + diff --git a/addons/website_event/views/event_tag_category_views.xml b/addons/website_event/views/event_tag_category_views.xml index 1d72a1eaaf7..ce825b3ff40 100644 --- a/addons/website_event/views/event_tag_category_views.xml +++ b/addons/website_event/views/event_tag_category_views.xml @@ -8,6 +8,7 @@ + diff --git a/addons/website_event/views/event_tag_views.xml b/addons/website_event/views/event_tag_views.xml new file mode 100644 index 00000000000..1ca34909bd2 --- /dev/null +++ b/addons/website_event/views/event_tag_views.xml @@ -0,0 +1,19 @@ + + + + event.tag.view.form.inherit + event.tag + + + + + + + + ['|', ('website_id', '=', website_id), ('website_id', '=', False)] + + + + + + diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index 7c73b46ac50..55056028a52 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -211,7 +211,7 @@
- +