diff --git a/district/forms.py b/district/forms.py index fb2974ad69dfab4118700df61415e3b68e00953f..dd158f5645d524b3cc2a63878d700f23f83967ab 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 246b89d8bfffb0fb3e9b2e723e28be57db6b2966..40546f134d5790e60077141e1a0d58f7d83c8f00 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 5917307f58d4e26d90eea9c4be5999995ea16fd2..b7bbe1061cfc6e87a6ec03a6914559b9ae41cc64 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 2c00933f4b2beeb0ae4ed913d1dfcef3f42a9225..830feaf1c50ee2cb7f0a19c7156798b85bf0aae1 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