Fixed various issues with the interim approval request email text when used for non-WG groups (RGs, for instance). Added supporting template filter functions. Related to issues #1979 and #1980.

- Legacy-Id: 11581

ietf/doc/templatetags/ietf_filters.py

@@ -630,4 +630,4 @@ def comma_separated_list(seq, end_word="and"):
         
 @register.filter()
 def role_names(roles):
-    return list(set([ r.name.name for r in roles ]))
+    return list(set([ "%s %s" % (r.group.name, r.name.name) for r in roles ]))

ietf/templates/meeting/interim_approval_request.txt

@@ -1,4 +1,4 @@
-{% load ams_filters %}
+{% load ams_filters %}{% load ietf_filters %}
 A new interim meeting {% if is_series %}series {% endif %}request has just been submitted by {{ requester }}.
 
 This request requires approval by the {{ group.interim_approval_roles|role_names|comma_separated_list:"or" }}

ietf/templates/meeting/interim_info.txt

@@ -1,8 +1,8 @@
 {% load ietf_filters %}
 ---------------------------------------------------------
-Working Group Name: {{ group.name|safe }}
-Area Name: {{ group.parent }}
-Session Requester: {{ requester }}
+{{ group.type.verbose_name }} Name: {{ group.name|safe }}
+{% if group.type.slug == "wg"  or group.type.slug == "directorate" or group.type.slug == "team" %}Area Name: {{ group.parent }}
+{% endif %}Session Requester: {{ requester }}
 
 {% if meeting.city %}City: {{ meeting.city }}
 Country: {{ meeting.country }}
@@ -14,7 +14,7 @@ Timezone: {{ meeting.time_zone }}
 Date: {{ session.official_timeslotassignment.timeslot.time|date:"Y-m-d" }}
 Start Time: {{ session.official_timeslotassignment.timeslot.time|date:"H:i" }}
 Duration: {{ session.requested_duration|format_timedelta }}
-Remote Instructions: {{ session.remote_instructions }}
+Remote Participation Information: {{ session.remote_instructions }}
 Agenda Note: {{ session.agenda_note }}
 {% endfor %}
 ---------------------------------------------------------