Add group members to application component

pasapp/templates/pasapp/components/application_professor.html

@@ -13,18 +13,11 @@
         {% endif %}
     </div>
     <div>
-        <a href="/user/{{application.student.username}}" class="undecorated-link underline-hover">
-            <b>{{application.student.first_name}} {{application.student.last_name}}</b>
-        </a>
+        {{application.student|name_link}}
         on {{application.date_created|date:"DATE_FORMAT"}}
         {% if application.group_members.all|length > 0 %}
-            (with
-            {% for groupmate in application.group_members.all %}
-                <a href="/user/{{groupmate.username}}" class="undecorated-link underline-hover">
-                {{groupmate.first_name}} {{groupmate.last_name}},
-                </a>
-            {% endfor %}
-            )
+            <br>    
+            with {{application.group_members.all|name_list:True}}
         {% endif %}
         <br>
         <hr>

pasapp/templates/pasapp/components/application_student.html

@@ -22,25 +22,17 @@
         </a>
         <br>
         {% if application.student.username != user.username %}
-            <a href="/user/{{application.student.username}}" class="undecorated-link underline-hover">
-                {{application.student.first_name}} {{application.student.last_name}}
-            </a>
+            {{application.student|name_link}}
             applied
         {%else%}
             You applied
         {% endif %}
         on {{application.date_created|date:"DATE_FORMAT"}}
         {% if application.group_members.all|length > 0 %}
-            (with
-            {% for groupmate in application.group_members.all %}
-                <a href="/user/{{groupmate.username}}" class="undecorated-link underline-hover">
-                {{groupmate.first_name}} {{groupmate.last_name}},
-                </a>
-            {% endfor %}
-            )
+            <br>    
+            with {{application.group_members.all|name_list}}
         {% endif %}
         {% if application.student.username != user.username %}
-            <br>
             <button type="button" onclick="leaveGroup({{application.id}})">Leave group</button>
         {% endif %}
         <br>

pasapp/templatetags/custom_filters.py

 from django import template
+from django.utils.safestring import mark_safe
+from django.utils.html import escape
 
 register = template.Library()
 
@@ -7,7 +9,6 @@ register = template.Library()
 def is_professor(user):
     return user.groups.filter(name='professor').exists()
 
-
 @register.filter(name='is_student')
 def is_student(user):
     return user.groups.filter(name='student').exists()
@@ -30,6 +31,20 @@ def is_closed(application):
     closed = closed or application.professor_status == 'DECL'
     return closed
 
+@register.filter(name="name_link")
+def name_link(user):
+    linked_name = f'<a href="/user/{escape(user.username)}" class="undecorated-link underline-hover">'
+    linked_name += f'{escape(user.first_name)} {escape(user.last_name)}</a>'
+    return mark_safe(linked_name)
+
+@register.filter(name="name_list")
+def name_list(users, clickable=False):
+    if clickable:
+        out = ', '.join([name_link(user) for user in users])
+        return mark_safe(out)
+    else:
+        return ', '.join([user.first_name + ' ' + user.last_name for user in users])
+
 @register.filter(name='minify')
 def minify(label):
     mapping = {