From d8dc8901be7c130ad28e2148ebeb8bb17f8cfeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 14 Aug 2020 07:00:09 +0000 Subject: [PATCH] [FW][IMP] website_event_meet: improve meeting room model SPECIFICATIONS Slightly improve meeting room model * set chat room as required. Meeting rooms without chat room make no sense; * allow to translate room summary. As this is displayed in frontend having it translated makes sense; * improve label of reached participants, allowing notably to display it nicely in backend; LINKS Coming from internal feedback while deploying online support Task ID-2314778 PR #55887 X-original-commit 54bd8281cf94ddee77073cf5d6356d847d08d024 --- addons/website_event_meet/models/event_meeting_room.py | 3 ++- addons/website_event_meet/views/event_meeting_room_views.xml | 2 +- addons/website_jitsi/models/chat_room_mixin.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/website_event_meet/models/event_meeting_room.py b/addons/website_event_meet/models/event_meeting_room.py index a7375d141e7..4d88f9aaedd 100644 --- a/addons/website_event_meet/models/event_meeting_room.py +++ b/addons/website_event_meet/models/event_meeting_room.py @@ -19,7 +19,8 @@ class EventMeetingRoom(models.Model): is_published = fields.Boolean(copy=True) # make the inherited field copyable event_id = fields.Many2one("event.event", string="Event", required=True, ondelete="cascade") is_pinned = fields.Boolean("Is Pinned") - summary = fields.Char("Summary") + chat_room_id = fields.Many2one("chat.room", required=True, ondelete="restrict") + summary = fields.Char("Summary", translate=True) target_audience = fields.Char("Audience", translate=True) @api.depends('name', 'event_id.name') diff --git a/addons/website_event_meet/views/event_meeting_room_views.xml b/addons/website_event_meet/views/event_meeting_room_views.xml index db7451ba1ed..c7489ccb355 100644 --- a/addons/website_event_meet/views/event_meeting_room_views.xml +++ b/addons/website_event_meet/views/event_meeting_room_views.xml @@ -36,7 +36,7 @@ - + diff --git a/addons/website_jitsi/models/chat_room_mixin.py b/addons/website_jitsi/models/chat_room_mixin.py index 5ced6599c66..247872be9fc 100644 --- a/addons/website_jitsi/models/chat_room_mixin.py +++ b/addons/website_jitsi/models/chat_room_mixin.py @@ -30,7 +30,7 @@ class ChatRoomMixin(models.AbstractModel): room_max_capacity = fields.Selection(string="Max capacity", related="chat_room_id.max_capacity", readonly=False, required=True) room_participant_count = fields.Integer("Participant count", related="chat_room_id.participant_count", readonly=False) room_last_activity = fields.Datetime("Last activity", related="chat_room_id.last_activity") - room_max_participant_reached = fields.Integer("Max participant reached", related="chat_room_id.max_participant_reached") + room_max_participant_reached = fields.Integer("Peak participants", related="chat_room_id.max_participant_reached") @api.model_create_multi def create(self, values_list):