diff --git a/ietf/group/mails.py b/ietf/group/mails.py index 8b676ee8a..dafec467e 100644 --- a/ietf/group/mails.py +++ b/ietf/group/mails.py @@ -32,7 +32,7 @@ def email_personnel_change(request, group, text, changed_personnel): send_mail_text(request, to, None, full_subject, text, cc=cc) -def email_milestones_changed(request, group, changes): +def email_milestones_changed(request, group, changes, states): def wrap_up_email(addrs, text): subject = u"Milestones changed for %s %s" % (group.acronym, group.type.name) @@ -52,9 +52,8 @@ def email_milestones_changed(request, group, changes): # then send only the approved milestones to those who shouldn't be # bothered with milestones pending approval - review_re = re.compile("Added .* for review, due") addrs = gather_address_lists('group_approved_milestones_edited',group=group) - msg = u"\n\n".join(c + "." for c in changes if not review_re.match(c)) + msg = u"\n\n".join(c + "." for c,s in zip(changes,states) if not s == "review") if (addrs.to or addrs.cc) and msg: wrap_up_email(addrs, msg) diff --git a/ietf/group/milestones.py b/ietf/group/milestones.py index 0815fc88b..434294fff 100644 --- a/ietf/group/milestones.py +++ b/ietf/group/milestones.py @@ -276,6 +276,7 @@ def edit_milestones(request, acronym, group_type=None, milestone_set="current"): set_attributes_from_form(f, f.milestone) elif action == "save" and not form_errors: changes = [] + states = [] for f in forms: change = save_milestone_form(f) @@ -290,9 +291,11 @@ def edit_milestones(request, acronym, group_type=None, milestone_set="current"): by=request.user.person, desc=change, milestone=f.milestone) changes.append(change) + states.append(f.milestone.state_id) + if milestone_set == "current": - email_milestones_changed(request, group, changes) + email_milestones_changed(request, group, changes, states) if milestone_set == "charter": return redirect('doc_view', name=group.charter.canonical_name())