From 63cc1875f8d654e63c74e42178f7ed1235135862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Tue, 27 Jun 2023 11:46:45 +0900
Subject: [PATCH] fix personal calendar, homepage search
---
calendar_utils/models.py | 10 +++++++++-
district/templates/district/base.html | 4 ++--
district/templates/district/district_person_page.html | 4 +++-
main/models.py | 4 ++--
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/calendar_utils/models.py b/calendar_utils/models.py
index 34f970b0..0b19b54e 100644
--- a/calendar_utils/models.py
+++ b/calendar_utils/models.py
@@ -92,7 +92,15 @@ class CalendarMixin(models.Model):
def get_fullcalendar_data(self) -> str:
calendar_format_events = []
- for event in self.calendar.past_events + self.calendar.future_events:
+ for event in (
+ self.calendar.past_events
+ if self.calendar.past_events is not None
+ else []
+ ) + (
+ self.calendar.future_events
+ if self.calendar.future_events is not None
+ else []
+ ):
parsed_event = {
"allDay": event["all_day"],
"start": event["start"].isoformat(),
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index 749727e2..3b5bdeb5 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -19,7 +19,7 @@
<!-- Bootstrap CSS -->
<!-- Styles -->
- <link rel="stylesheet" href="https://styleguide.pirati.cz/2.12.x/css/styles.css">
+ <link rel="stylesheet" href="https://styleguide.pirati.cz/2.13.x/css/styles.css">
<link href="{% static "shared/vendor/fancybox/jquery.fancybox.min.css" %}" rel="stylesheet">
<link rel="stylesheet" href="{% static "shared/css/helpers.css" %}">
@@ -347,7 +347,7 @@
</footer>
<script src="{% static "styleguide291/assets/js/vue.2.6.11.js" %}"></script>
- <script src="https://styleguide.pirati.cz/2.10.x/js/main.bundle.js"></script>
+ <script src="https://styleguide.pirati.cz/2.13.x/js/main.bundle.js"></script>
<script src="{% static "shared/vendor/jquery/jquery-3.4.1.min.js" %}"></script>
<script src="{% static "shared/vendor/lazysizes/lazysizes.min.js" %}"></script>
<script src="{% static "shared/vendor/fancybox/jquery.fancybox.min.js" %}"></script>
diff --git a/district/templates/district/district_person_page.html b/district/templates/district/district_person_page.html
index 3c967e5c..a40369ce 100644
--- a/district/templates/district/district_person_page.html
+++ b/district/templates/district/district_person_page.html
@@ -27,7 +27,9 @@
{% if page.calendar %}
<section>
<h2 class="head-alt-md mb-3"><i class="ico--calendar mr-4"></i>Kalendář</h2>
- <ui-person-calendar events='{{ page.get_fullcalendar_data|safe }}'></ui-person-calendar>
+ <div class="__js-root">
+ <ui-month-calendar events='{{ page.get_fullcalendar_data|safe }}'></ui-month-calendar>
+ </div>
</section>
{% endif %}
</section>
diff --git a/main/models.py b/main/models.py
index 4522d842..74fa5fda 100644
--- a/main/models.py
+++ b/main/models.py
@@ -503,7 +503,7 @@ class MainArticlesPage(
def get_all_articles_search_response(self, request):
article_paginator = Paginator(
- MainArticlePage.objects.live().search(request.GET["q"]).order_by("-date"),
+ MainArticlePage.objects.live().order_by("-date").search(request.GET["q"]),
10,
)
article_page = article_paginator.get_page(request.GET.get("page", 1))
@@ -527,7 +527,7 @@ class MainArticlesPage(
query = request.GET["q"]
article_results = (
- MainArticlePage.objects.live().search(query).order_by("-date")[:11]
+ MainArticlePage.objects.live().order_by("-date").search(query)[:11]
)
return render(
--
GitLab