From 649e35e26cc9bd9aff1bee4b1a0dec9b026c3b64 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Tue, 15 Apr 2025 23:25:15 +0200 Subject: [PATCH] fix: filter for published groups --- jdav_web/members/admin.py | 2 +- jdav_web/members/templates/members/group_checklist.tex | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index f06a4ea..295f9e2 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -856,7 +856,7 @@ class GroupAdmin(CommonAdminMixin, admin.ModelAdmin): n_weeks = 17 # TODO: als variable in settings.toml? context = { - 'groups': self.model.objects.all(), + 'groups': self.model.objects.filter(show_website=True), 'settings': settings, 'range': range(n_weeks), 'extras': range(4), diff --git a/jdav_web/members/templates/members/group_checklist.tex b/jdav_web/members/templates/members/group_checklist.tex index bf6c1e4..ef11bdf 100644 --- a/jdav_web/members/templates/members/group_checklist.tex +++ b/jdav_web/members/templates/members/group_checklist.tex @@ -62,7 +62,7 @@ \noindent {{ weekdays|index:group.weekday|esc_all }}, {{ group.start_time }} - {{ group.end_time }} Uhr\\ \vspace{12pt} -\begin{tabularx}{0.94\textwidth}{lXl|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l} +\begin{tabularx}{0.94\textwidth}{lX|c|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l} \toprule \textbf{\#} & \textbf{Name} & \textbf{JL} {% for i in range %} & \begin{sideways} {{ dates|index:i|add:group.weekday|date_vs }} \end{sideways} @@ -72,7 +72,7 @@ \midrule {{ forloop.counter }} & {{ m.name|esc_all }} & - {% if m in group.leiters.all %} x {% endif %} + {% if m in group.leiters.all %} X {% endif %} {% for i in range %} & {% endfor %}\\ {% endfor %}