From 43fd02542d70d8b5bd0a54cda8b2628eced7dbed Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 20 Sep 2021 15:02:27 +0200
Subject: [PATCH] Show correct status icon for events in week overview
---
CHANGELOG.rst | 1 +
aleksis/apps/alsijil/util/alsijil_helpers.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2d9970d00..788236f8c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Fixed
~~~~~
* Translate table columns and filter button on person overview page.
+* Show correct status icon for events.
`2.0rc6`_ - 2021-08-25
----------------------
diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py
index 29381c6cb..95c49a0b5 100644
--- a/aleksis/apps/alsijil/util/alsijil_helpers.py
+++ b/aleksis/apps/alsijil/util/alsijil_helpers.py
@@ -85,7 +85,8 @@ def annotate_documentations(
instances = instances.annotate(
has_documentation=Exists(
LessonDocumentation.objects.filter(
- ~Q(topic__exact=""), week=wanted_week.week, year=wanted_week.year,
+ ~Q(topic__exact=""),
+ Q(week=wanted_week.week, year=wanted_week.year) | Q(week=None, year=None),
).filter(**{klass.label_: OuterRef("pk")})
)
)
--
GitLab