Add method/field/role as tags on Project pages

cdhweb/projects/forms.py

@@ -14,21 +14,21 @@ class ProjectFiltersForm(forms.Form):
         empty_label="--Select--",
         required=False,
         blank=True,
-        label="Method/Approach"
+        label="Method/Approach",
     )
     field = forms.ModelChoiceField(
         ProjectField.objects.all(),
         empty_label="--Select--",
         required=False,
         blank=True,
-        label="Field of Study"
+        label="Field of Study",
     )
     role = forms.ModelChoiceField(
         ProjectRole.objects.all(),
         empty_label="--Select--",
         required=False,
         blank=True,
-        label="Role"
+        label="Role",
     )
     current = forms.BooleanField(required=False, initial=True)
     cdh_built = forms.BooleanField(required=False, label="Built by CDH")

cdhweb/projects/models.py

@@ -1,3 +1,5 @@
+import itertools
+
 from django import forms
 from django.db import models
 from django.utils import timezone
@@ -279,6 +281,14 @@ def get_sitemap_urls(self, request):
             urls[0]["priority"] = 0.6
         return urls
 
+    def display_tags(self):
+        return sorted(
+            str(t)
+            for t in itertools.chain(
+                self.method.all(), self.field.all(), self.role.all()
+            )
+        )
+
 
 class GrantType(models.Model):
     """Model to track kinds of grants"""

templates/includes/project_hero.html

@@ -1,7 +1,7 @@
 {% load wagtailcore_tags wagtailimages_tags l10n %}
 
 <div class="project-hero content-width grid-standard">
-    
+
     <div class="project-hero__title">
         <h1>{{ self.title}}</h1>
         {% if page.cdh_built %}<div class="tag tag--dark">Built by CDH</div>{% endif %}
@@ -11,10 +11,10 @@ <h1>{{ self.title}}</h1>
             {{ self.description | richtext }}
         {% endif %}
 
-        {% if self.tags.all %}
+        {% if self.display_tags %}
             <div class="tag-list">
-                {% for tag in self.tags.all %}
-                    <div class="tag">{{ tag }}</div>    
+                {% for tag in self.display_tags %}
+                    <div class="tag">{{ tag }}</div>
                 {% endfor %}
             </div>
         {% endif %}
@@ -28,7 +28,7 @@ <h1>{{ self.title}}</h1>
     </div>
 
     {% if self.hero_image %}
-        {% comment %}    
+        {% comment %}
             All are cropped to a 16:9 ratio. This differs from design, as discussed.
             If changing this by image rendition, update aspect-ratio in the CSS instead
             of via inline style.
@@ -42,11 +42,11 @@ <h1>{{ self.title}}</h1>
             <source srcset="{{ img_sm.url }}" media="(min-width: 500px)">
             <source srcset="{{ img_xl.url }}" media="(min-width: 1200px)">
             <img
-                src="{{ img_base.url }}" 
+                src="{{ img_base.url }}"
                 alt="{{ self.alt_text|default:img_base.alt }}"
                 style="aspect-ratio: {{ img_base.width|unlocalize }} / {{ img_base.height|unlocalize }}"
             />
         </picture>
     {% endif %}
-    
+
 </div>