Skip to content

Commit 19aeb5d

Browse files
authored
check time slot l10n presence (#2891)
* check time slot l10n presence * fix
1 parent b6f734c commit 19aeb5d

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

app/views/admin/communication/websites/agenda/events/days/static_children/_list.html.erb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ collection.each do |child_event|
55
next if child_event_l10n.nil?
66
if child_event.time_slots.any?
77
time_slot_l10n = child_event.time_slots.ordered.first.localization_for(language)
8-
hugo = time_slot_l10n.hugo(@website)
8+
hugo = time_slot_l10n.hugo(@website) if time_slot_l10n.present?
99
else
1010
hugo = child_event_l10n.hugo(@website)
1111
end
12+
if hugo.present?
1213
%>
1314
<%= render 'admin/application/static/hugo/single', hugo: hugo, depth: 1 %>
14-
<% end %>
15+
<%
16+
end
17+
end
18+
%>

app/views/admin/communication/websites/agenda/events/show/_links_to_static_files.html.erb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<%= osuny_panel 'Static files', small: true do %>
22
<% if @event.time_slots.any? %>
33
<%
4-
@event.time_slots.each do |time_slot|
5-
time_slot_l10n = time_slot.localization_for(current_language) %>
4+
@event.time_slots.each do |time_slot| %>
65
<%= link_to 'Créneau du ' + l(time_slot.datetime),
76
static_admin_communication_website_agenda_event_time_slot_path(
87
event_id: @event.id,
@@ -16,7 +15,7 @@
1615
event_id: @event.id,
1716
id: day.id
1817
) %><br>
19-
<% end %>
18+
<% end %>
2019
<% else %>
2120
<%= link_to 'Événement sans créneau ni enfant', static_admin_communication_website_agenda_event_path(@event) %>
2221
<% end %>

app/views/admin/communication/websites/agenda/events/time_slots/static.html.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<%
22
language = @l10n.language
33
time_slot = @l10n.time_slot
4-
time_slot_l10n = time_slot.localization_for(language)
54
event = time_slot.event
65
event_l10n = @l10n.event_l10n
76
%>---
@@ -18,7 +17,7 @@ event_l10n = @l10n.event_l10n
1817
l10n: event_l10n,
1918
locale: language.iso_code %>
2019
<%= render 'admin/communication/websites/agenda/events/static/parent', event: event, language: language %>
21-
<%= render 'admin/communication/websites/agenda/events/time_slots/static/current', time_slot: time_slot, l10n: time_slot_l10n %>
20+
<%= render 'admin/communication/websites/agenda/events/time_slots/static/current', time_slot: time_slot, l10n: @l10n %>
2221
<%= render 'admin/communication/websites/agenda/events/time_slots/static/all', event: event, language: language %>
2322
<%= render 'admin/application/l10n/static', about: event_l10n %>
2423
<%= render 'admin/application/images/featured/static', about: event_l10n %>

0 commit comments

Comments
 (0)