pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] {website_}event{_meet}: small imp frontend and backend

Browse Source 
- Now the start datetime and the location of an event is not editable
in the frontend editor.
It does not make really sense to change the location and for the
datetime it could lead to some Validation error as we don't know
in the card view the end datetime.

- Fix a display issue in the backend kanban view when the
location is too long and not inline with the icon.

- Align correctly the number of people in a community room

task-2845417

Part-of: odoo/odoo#91883
This commit is contained in:
Jérémy Hennecart (jeh)
2022-09-06 22:31:04 +02:00
parent 4fa73dc531
commit 8c0bfcc340
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/views/event_event_views.xml
+6 -3
View File
@@ -35,7 +35,7 @@
<field name="kanban_state" widget="state_selection" class="ms-auto float-end"/>
<div class="oe_title">
<label for="name" string="Event Name"/>
<h1><field class="text-break" name="name" placeholder="e.g. &quot;Conference for Architects&quot;"/></h1>
<h1><field class="text-break" name="name" placeholder="e.g. Conference for Architects"/></h1>
</div>
<group>
<group>
@@ -148,7 +148,7 @@
<field name="arch" type="xml">
<form>
<group>
<field name="name" placeholder="e.g. &quot;Conference for Architects&quot;"/>
<field name="name" placeholder="e.g. Conference for Architects"/>
<label for="date_begin" string="Date"/>
<div class="o_row">
<field name="date_begin" widget="daterange" options="{'related_end_date': 'date_end'}"/>
@@ -201,7 +201,10 @@
<div class="o_kanban_record_title o_text_overflow" t-att-title="record.name.value">
<field name="name"/>
</div>
<div t-if="record.address_id.value"><i class="fa fa-map-marker" title="Location"/> <span class="o_text_overflow o_event_kanban_location" t-esc="record.address_id.value"/></div>
<div t-if="record.address_id.value" class="d-flex">
<i class="fa fa-map-marker mt-1 me-1" title="Location"/>
<span t-esc="record.address_id.value"/>
</div>
</div>
<h5 class="o_event_fontsize_11 p-0">
<a name="%(event_registration_action_stats_from_event)d"
addons/website_event/views/event_templates_list.xml
+10 -10
View File
@@ -172,9 +172,9 @@
<t t-set="_record" t-value="event"/>
<!-- Short Date -->
<div class="o_wevent_event_date position-absolute shadow-sm">
<span t-field="event.date_begin" t-options="{'tz_name': event.date_tz, 'format': 'LLL'}" class="o_wevent_event_month"/>
<span t-field="event.date_begin" t-options="{'tz_name': event.date_tz, 'format': 'dd'}" class="o_wevent_event_day oe_hide_on_date_edit"/>
<div class="o_wevent_event_date position-absolute shadow-sm o_not_editable">
<span t-out="event.date_begin" t-options="{'widget': 'datetime', 'tz_name': event.date_tz, 'format': 'LLL'}" class="o_wevent_event_month"/>
<span t-out="event.date_begin" t-options="{'widget': 'datetime', 'tz_name': event.date_tz, 'format': 'dd'}" class="o_wevent_event_day oe_hide_on_date_edit"/>
</div>
<!-- Participating -->
<small t-if="event.is_participating" class="o_wevent_participating text-bg-success">
@@ -197,15 +197,15 @@
<span t-field="event.name" itemprop="name"/>
</h5>
<!-- Start Date & Time -->
<time itemprop="startDate" t-att-datetime="event.date_begin">
<span t-field="event.date_begin"
t-options="{'tz_name': event.date_tz, 'date_only': 'true', 'format': 'long', 'tz_name': event.date_tz}"/> -
<span t-field="event.date_begin" class="oe_hide_on_date_edit"
t-options="{'tz_name': event.date_tz, 'time_only': 'true', 'format': 'short', 'tz_name': event.date_tz}"/>
(<span t-field="event.date_tz"/>)
<time class="o_not_editable" itemprop="startDate" t-att-datetime="event.date_begin">
<span t-out="event.date_begin"
t-options="{'widget': 'datetime', 'tz_name': event.date_tz, 'date_only': 'true', 'format': 'long', 'tz_name': event.date_tz}"/> -
<span t-out="event.date_begin"
t-options="{'widget': 'datetime', 'tz_name': event.date_tz, 'time_only': 'true', 'format': 'short', 'tz_name': event.date_tz}"/>
(<span t-out="event.date_tz"/>)
</time>
<!-- Location -->
<div itemprop="location" t-field="event.address_id" t-options="{'widget': 'contact', 'fields': ['city'], 'no_marker': 'true'}"/>
<div class="o_not_editable" itemprop="location" t-out="event.address_id" t-options="{'widget': 'contact', 'fields': ['city'], 'no_marker': 'true'}"/>
<div class="mt8">
<t t-foreach="event.tag_ids.filtered(lambda tag: tag.category_id.is_published)" t-as="tag">
<span t-if="tag.color"
addons/website_event_meet/views/event_meet_templates_list.xml
+1 -1
View File
@@ -134,7 +134,7 @@
</div>
<span class="text-muted" t-field="meeting_room.summary"/>
<div class="d-flex flex-row justify-content-between align-items-center">
<span class="h6 m-0 row">
<span class="h6 m-0">
<span t-out="meeting_room.room_participant_count"/>&amp;nbsp;
<span t-if="meeting_room.target_audience" class="text-uppercase" t-field="meeting_room.target_audience"/>
<span t-else="" class="text-uppercase">participant(s)</span>