diff options
| author | std-odoo <std@odoo.com> | 2020-09-25 11:16:46 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-09-29 11:41:12 +0000 |
| commit | f60abdde991f5beb84d06b2cd76553afe9f9c88d (patch) | |
| tree | 262e3ba6842d0a44cccc3ccaffd9ef4d71159ff6 /addons/website_event_meet | |
| parent | 14ed07f7ac7db8f86070474a1c69a820f1bb8787 (diff) | |
[FIX] website_event_{meet, track_exhibitor}: show a warning message when the event is finished
Bug
===
If the event is finished, we should not display the warning message "The
Event starts on...". Instead, we should say that the event is over.
We therefore better handle timeframes.
Task ID-2345894
PR #58516
X-original-commit: 7a41dadd9fbfb4643d981d9e9eba90befad3e013
Diffstat (limited to 'addons/website_event_meet')
| -rw-r--r-- | addons/website_event_meet/views/event_meet_templates_list.xml | 15 | ||||
| -rw-r--r-- | addons/website_event_meet/views/event_meet_templates_page.xml | 37 |
2 files changed, 33 insertions, 19 deletions
diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml index b1c7fadfbd2..7405c886bb6 100644 --- a/addons/website_event_meet/views/event_meet_templates_list.xml +++ b/addons/website_event_meet/views/event_meet_templates_list.xml @@ -67,10 +67,17 @@ </div> </nav> <button type="button" class="close" data-dismiss="modal" aria-label="Close">&times;</button> - <span>This room is not open right now!</span><br /> - Join us here on the - <strong itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'format': 'medium'}"/> - to have a chat with us! + <t t-if="not event.is_done"> + <span>This room is not open right now!</span><br /> + Join us here on the + <strong itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'format': 'medium'}"/> + to have a chat with us! + </t> + <t t-else=""> + Event <span t-esc="event.name" class="font-weight-bold"/> is over. + <br/> + <span>Join us next time to chat about <b t-esc="meeting_room.name"/>!</span> + </t> </div> <div class="modal-body row"> diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml index c885c2e7e60..158a8fdc866 100644 --- a/addons/website_event_meet/views/event_meet_templates_page.xml +++ b/addons/website_event_meet/views/event_meet_templates_page.xml @@ -30,21 +30,28 @@ <template id="meeting_room_main" name="Meeting Room: Main Content"> <div t-att-class="'col-12 o_wevent_online_page_main o_wemeet_room_main bg-white p-0 %s' % ('col-md-9 col-lg-10' if option_widescreen else 'col-md-8 col-lg-9')"> <!-- EVENT NOT STARTED ALERTS --> - <div t-if="not meeting_room.event_id.is_ongoing" class="alert alert-warning text-center"> - The event <span t-esc="meeting_room.event_id.name" class="font-weight-bold"/> - <span t-if="meeting_room.event_id.start_today"> - starts in - <span t-esc="meeting_room.event_id.start_remaining" - t-options="{'widget': 'duration', 'digital': True, 'unit': 'minute', 'round': 'minute'}"/>. - </span> - <span class="my-0" t-else="meeting_room.event_id.start_today"> - starts on - <span t-field="meeting_room.event_id.with_context(tz=meeting_room.event_id.date_tz).date_begin" - t-options="{'format': 'medium'}"/> (<t t-esc="meeting_room.event_id.date_tz"/>). - </span> - <br/> - <span>Join us there to chat about <b t-esc="meeting_room.name"/> !</span> - </div> + <t t-if="not meeting_room.event_id.is_ongoing"> + <div t-if="meeting_room.event_id.is_done" class="alert alert-warning text-center"> + The event <span t-esc="meeting_room.event_id.name" class="font-weight-bold"/> is over. + <br/> + <span>Join us next time to chat about <b t-esc="meeting_room.name"/>!</span> + </div> + <div t-else="" class="alert alert-warning text-center"> + The event <span t-esc="meeting_room.event_id.name" class="font-weight-bold"/> + <span t-if="meeting_room.event_id.start_today"> + starts in + <span t-esc="meeting_room.event_id.start_remaining" + t-options="{'widget': 'duration', 'digital': True, 'unit': 'minute', 'round': 'minute'}"/>. + </span> + <span class="my-0" t-else="meeting_room.event_id.start_today"> + starts on + <span t-field="meeting_room.event_id.with_context(tz=meeting_room.event_id.date_tz).date_begin" + t-options="{'format': 'medium'}"/> (<t t-esc="meeting_room.event_id.date_tz"/>). + </span> + <br/> + <span>Join us there to chat about <b t-esc="meeting_room.name"/> !</span> + </div> + </t> <!-- ROOM CONTENT --> <div class="d-flex flex-column"> <div t-if="meeting_room.room_is_full and not is_event_manager" class="alert alert-warning text-center"> |
