From ed5248ce2afd38e89b00d3bf2e2600d75526c48a Mon Sep 17 00:00:00 2001
From: xaralis <filip.varecha@fragaria.cz>
Date: Tue, 26 Apr 2022 17:53:40 +0200
Subject: [PATCH] fix(district,region): center calendar would use root page
calendar rather than center page specific one
---
district/templates/district/district_center_page.html | 5 ++++-
region/templates/region/region_center_page.html | 5 ++++-
shared/templates/shared/small_calendar_snippet.html | 3 ++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/district/templates/district/district_center_page.html b/district/templates/district/district_center_page.html
index 488d6778..b647958d 100644
--- a/district/templates/district/district_center_page.html
+++ b/district/templates/district/district_center_page.html
@@ -28,7 +28,10 @@
{% include_block block %}
{% endfor %}
</div>
- {% include "shared/small_calendar_snippet.html" %}
+
+ {% if page.has_calendar %}
+ {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
+ {% endif %}
</div>
<div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
diff --git a/region/templates/region/region_center_page.html b/region/templates/region/region_center_page.html
index 74d3c2e0..621de929 100644
--- a/region/templates/region/region_center_page.html
+++ b/region/templates/region/region_center_page.html
@@ -28,7 +28,10 @@
{% include_block block %}
{% endfor %}
</div>
- {% include "shared/small_calendar_snippet.html" %}
+
+ {% if page.has_calendar %}
+ {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
+ {% endif %}
</div>
<div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
diff --git a/shared/templates/shared/small_calendar_snippet.html b/shared/templates/shared/small_calendar_snippet.html
index 60757687..ab10f212 100644
--- a/shared/templates/shared/small_calendar_snippet.html
+++ b/shared/templates/shared/small_calendar_snippet.html
@@ -2,8 +2,9 @@
<h2 class="head-heavy-sm mb-4 mt-4">
Kalendář akcí
</h2>
+
<div class="mb-4">
- {% for event in page.root_page.calendar.current_events %}
+ {% for event in events|default:page.root_page.calendar.current_events %}
<div class="grid grid-cols-12 items-center calendar-table-row calendar-table-row--standalone">
<div class="col-span-2 text-orange-300 head-alt-md calendar-table-row__col">
<span>{{ event.begin|date:"j." }}</span>
--
GitLab