diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 05851c99b..66f0e82ac 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -508,10 +508,6 @@ def comma_separated_list(seq, end_word="and"): return u"".join(seq) else: return u", ".join(seq[:-1]) + u" %s %s"%(end_word, seq[-1]) - -@register.filter() -def role_names(roles): - return list(set([ "%s %s" % (r.group.name, r.name.name) for r in roles ])) @register.filter() def zaptmp(s): diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index 3ba280514..ead482bf9 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -484,7 +484,7 @@ def make_materials_directories(meeting): def send_interim_approval_request(meetings): - """Sends an email to the secretariat, group chairs, and resposnible area + """Sends an email to the secretariat, group chairs, and responsible area director or the IRTF chair noting that approval has been requested for a new interim meeting. Takes a list of one or more meetings.""" group = meetings[0].session_set.first().group @@ -501,7 +501,12 @@ def send_interim_approval_request(meetings): is_series = True else: is_series = False - context = locals() + approver_set = set() + for role in group.interim_approval_roles(): + approver = "%s of the %s" % ( role.name.name, role.group.name) + approver_set.add(approver) + approvers = list(approver_set) + context = locals() # TODO Unnecessarily complex, context needs to only contain what the template needs send_mail(None, to_email, from_email, diff --git a/ietf/templates/meeting/interim_approval_request.txt b/ietf/templates/meeting/interim_approval_request.txt index a2f76d2ed..bd0b572f3 100644 --- a/ietf/templates/meeting/interim_approval_request.txt +++ b/ietf/templates/meeting/interim_approval_request.txt @@ -1,7 +1,7 @@ {% 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" }} +This request requires approval by the {{ approvers|comma_separated_list:"or" }} The meeting{{ meetings|pluralize }} can be approved here: {% for url in approval_urls %}{{ url }}