Merge branch 'cherry-pick-24780481' into 'release/1.15'

Merge branch 'fix/role-committee' into 'master'

See merge request !807

website/activemembers/templates/activemembers/committee_detail.html

@@ -56,13 +56,13 @@
                   {% blocktrans with since=member.committee_since|date:"Y" %}Committee member since: {{ since }}{% endblocktrans %}
                   {% endif %}
                   </p>
+                  {% if member.role %}
+                  <p>{{ member.role }}</p>
+                  {% endif %}
                 </div>
               </div>
               <div class="post-body avatar-subtitle">
                 {{ member.profile.display_name }}
-                {% if member.role %}
-                <p>{{ member.role }}</p>
-                {% endif %}
               </div>
             </div>
           </a>

website/activemembers/views.py

@@ -27,6 +27,7 @@ def committee_detail(request, id):
     for membership in memberships:
         member = membership.member
         member.chair = membership.chair
+        member.role = membership.role
         member.committee_since = membership.initial_connected_membership.since
         members.append(member)  # list comprehension would be more pythonic?