diff options
| author | std-odoo <std@odoo.com> | 2020-09-25 12:00:58 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-09-29 11:41:12 +0000 |
| commit | c7414488602d12ea91a18d3b6df69f4612b66e70 (patch) | |
| tree | 541900e0f284e1618205c2e154bc7ada7d4bd37b | |
| parent | f60abdde991f5beb84d06b2cd76553afe9f9c88d (diff) | |
[FIX] website_event_track_exhibitor: fix the hour displayed in the connect modal
Bug
===
On website, we can join the room of an exhibitor. If we are not in the right
time range a popup is displayed. If the exhibitor room starts at 10h30
it currently displays 10.5 instead.
Technical
=========
The option "float_time" only work in the python templates.
Here, it was used in a JS template.
Task ID-2345894
PR #58516
closes odoo/odoo#58797
X-original-commit: 2296ee82e4d719b734731b67013ca652d1fb92f6
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
| -rw-r--r-- | addons/website_event_track_exhibitor/controllers/exhibitor.py | 3 | ||||
| -rw-r--r-- | addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/website_event_track_exhibitor/controllers/exhibitor.py b/addons/website_event_track_exhibitor/controllers/exhibitor.py index cb7add8a0eb..2418b785ea0 100644 --- a/addons/website_event_track_exhibitor/controllers/exhibitor.py +++ b/addons/website_event_track_exhibitor/controllers/exhibitor.py @@ -9,6 +9,7 @@ from odoo import exceptions, http from odoo.addons.website_event_track.controllers.event_track import EventTrackController from odoo.http import request from odoo.osv import expression +from odoo.tools import format_duration class ExhibitorController(EventTrackController): @@ -198,6 +199,8 @@ class ExhibitorController(EventTrackController): sponsor_data['event_start_remaining'] = sponsor.event_id.start_remaining sponsor_data['event_date_begin_located'] = sponsor.event_id.date_begin_located sponsor_data['event_date_end_located'] = sponsor.event_id.date_end_located + sponsor_data['hour_from_str'] = format_duration(sponsor_data['hour_from']) + sponsor_data['hour_to_str'] = format_duration(sponsor_data['hour_to']) return sponsor_data diff --git a/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml index 72529e70548..1e138a44b12 100644 --- a/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml +++ b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml @@ -30,9 +30,9 @@ <span t-esc="widget.sponsorData.name" class="font-weight-bold"/> is not available right now.<br /> Come back between <strong> - <t t-esc="widget.sponsorData.hour_from" t-options="{'widget': 'float_time'}"/> + <t t-esc="widget.sponsorData.hour_from_str"/> - - <t t-esc="widget.sponsorData.hour_to" t-options="{'widget': 'float_time'}"/> + <t t-esc="widget.sponsorData.hour_to_str"/> </strong> (<span t-esc="widget.sponsorData.event_date_tz"/>) to meet them ! </div> |