fix tag loading

district/forms.py

@@ -62,9 +62,10 @@ class DistrictArticlesPageForm(SharedArticlesPageForm, JekyllImportForm):
         self.fields["shared_tags"].queryset = SharedTag.objects.order_by("name")
 
         if self.instance.pk:
-            # Get tags assigned to child DistrictArticlePage instances
-            valid_tag_ids = DistrictArticleTag.objects.filter(
+            valid_tag_ids = list(DistrictArticleTag.objects.filter(
                 content_object__in=self.instance.get_children().specific()
-            ).values_list('tag_id', flat=True).distinct()
+            ).values_list('tag_id', flat=True).distinct().all())
+
+            valid_tag_ids += list(self.instance.shared_tags.all())
             
             self.fields['displayed_tags'].queryset = DistrictArticleTag.objects.filter(id__in=valid_tag_ids).order_by("tag__name")
\ No newline at end of file

elections/templates/elections/elections_articles_page.html

@@ -2,7 +2,7 @@
 
 {% block content %}
   {% include 'styleguide2/includes/organisms/layout/elections/navbar.html' with selected_item=page.get_menu_title %}
-  {% include 'styleguide2/includes/organisms/header/elections/articles_header.html' with title=page.title tags=tags %}
+  {% include 'styleguide2/includes/organisms/header/elections/articles_header.html' with show_tags=page.show_tags title=page.title tags=tags %}
 
   <main role="main">
     {% include 'styleguide2/includes/organisms/articles/main_articles_timeline.html' %}

uniweb/forms.py

@@ -32,6 +32,6 @@ class UniwebArticlesPageForm(SharedArticlesPageForm, WagtailAdminPageForm):
         if self.instance.pk:
             valid_tag_ids = UniwebArticleTag.objects.filter(
                 content_object__in=self.instance.get_children().specific()
-            ).values_list('tag_id', flat=True).distinct()
-            
-            self.fields['displayed_tags'].queryset = UniwebArticleTag.objects.filter(id__in=valid_tag_ids).order_by("tag__name")
+            ).values_list('id', flat=True).distinct()
+
+            self.fields['displayed_tags'].queryset = UniwebArticleTag.objects.filter(id__in=valid_tag_ids).order_by("tag__name").distinct("tag__name")
\ No newline at end of file

uniweb/templates/uniweb/uniweb_articles_index_page.html

@@ -4,7 +4,7 @@
 {% block content %}
 
 {% include 'styleguide2/includes/organisms/layout/district/navbar.html' with selected_item=page.get_menu_title %}
-{% include 'styleguide2/includes/organisms/header/articles_header.html' with title=page.title tags=tags %}
+{% include 'styleguide2/includes/organisms/header/articles_header.html' with title=page.title tags=tags show_tags=page.show_tags %}
 
 <main role="main">
   {% include 'styleguide2/includes/organisms/articles/main_articles_timeline.html' %}