From 3dc8dea7528d3d46ac20a42ae23e7ab380efd354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org>
Date: Fri, 30 Aug 2024 17:42:19 +0200
Subject: [PATCH] fix querysets
---
district/forms.py | 1 -
elections/forms.py | 1 -
main/forms.py | 1 -
uniweb/forms.py | 3 ++-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/district/forms.py b/district/forms.py
index fb2974ad..dd158f56 100644
--- a/district/forms.py
+++ b/district/forms.py
@@ -85,6 +85,5 @@ class DistrictArticlesPageForm(SharedArticlesPageForm, JekyllImportForm):
.distinct("name")
)
else:
- self.fields["shared_tags"].queryset = DistrictArticleTag.objects.filter(id=-1)
self.fields["displayed_tags"].queryset = DistrictArticleTag.objects.filter(id=-1)
self.fields["displayed_shared_tags"].queryset = SharedTag.objects.filter(id=-1)
diff --git a/elections/forms.py b/elections/forms.py
index 246b89d8..40546f13 100644
--- a/elections/forms.py
+++ b/elections/forms.py
@@ -60,6 +60,5 @@ class ElectionsArticlesPageForm(SharedArticlesPageForm, JekyllImportForm):
.distinct("name")
)
else:
- self.fields["shared_tags"].queryset = ElectionsArticleTag.objects.filter(id=-1)
self.fields["displayed_tags"].queryset = ElectionsArticleTag.objects.filter(id=-1)
self.fields["displayed_shared_tags"].queryset = SharedTag.objects.filter(id=-1)
diff --git a/main/forms.py b/main/forms.py
index 5917307f..b7bbe106 100644
--- a/main/forms.py
+++ b/main/forms.py
@@ -60,6 +60,5 @@ class MainArticlesPageForm(SharedArticlesPageForm, JekyllImportForm):
.distinct("name")
)
else:
- self.fields["shared_tags"].queryset = MainArticleTag.objects.filter(id=-1)
self.fields["displayed_tags"].queryset = MainArticleTag.objects.filter(id=-1)
self.fields["displayed_shared_tags"].queryset = SharedTag.objects.filter(id=-1)
\ No newline at end of file
diff --git a/uniweb/forms.py b/uniweb/forms.py
index 2c00933f..830feaf1 100644
--- a/uniweb/forms.py
+++ b/uniweb/forms.py
@@ -29,6 +29,8 @@ class UniwebArticlesPageForm(SharedArticlesPageForm, WagtailAdminPageForm):
super().__init__(*args, **kwargs)
+ self.fields["shared_tags"].queryset = SharedTag.objects.order_by("name")
+
if self.instance.pk:
valid_tag_ids = (
UniwebArticleTag.objects.filter(
@@ -52,6 +54,5 @@ class UniwebArticlesPageForm(SharedArticlesPageForm, WagtailAdminPageForm):
.distinct("name")
)
else:
- self.fields["shared_tags"].queryset = UniwebArticleTag.objects.filter(id=-1)
self.fields["displayed_tags"].queryset = UniwebArticleTag.objects.filter(id=-1)
self.fields["displayed_shared_tags"].queryset = SharedTag.objects.filter(id=-1)
\ No newline at end of file
--
GitLab