Renamed a very specialized function from email_secretariat() to email_iesg_secretary_re_charter().

 - Legacy-Id: 7923

Author: levkowetz

ietf/doc/views_charter.py

@@ -30,7 +30,7 @@
 from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.group.mails import email_secretariat
+from ietf.group.mails import email_iesg_secretary_re_charter
 
 
 class ChangeStateForm(forms.Form):
@@ -143,7 +143,7 @@ def change_state(request, name, option=None):
                 charter.save()
 
                 if message:
-                    email_secretariat(request, group, "Charter state changed to %s" % charter_state.name, message)
+                    email_iesg_secretary_re_charter(request, group, "Charter state changed to %s" % charter_state.name, message)
 
                 email_state_changed(request, charter, "State changed to %s." % charter_state)
 
@@ -670,7 +670,7 @@ def approve(request, name):
 
         fix_charter_revision_after_approval(charter, login)
 
-        email_secretariat(request, group, "Charter state changed to %s" % new_charter_state.name, change_description)
+        email_iesg_secretary_re_charter(request, group, "Charter state changed to %s" % new_charter_state.name, change_description)
 
         # move milestones over
         milestones_to_delete = list(group.groupmilestone_set.filter(state__in=("active", "review")))

ietf/group/edit.py

@@ -22,7 +22,7 @@
 from ietf.ietfauth.utils import has_role
 from ietf.person.forms import EmailsField
 from ietf.person.models import Person, Email
-from ietf.group.mails import email_secretariat
+from ietf.group.mails import email_iesg_secretary_re_charter
 
 MAX_GROUP_DELEGATES = 3
 
@@ -340,7 +340,7 @@ def conclude(request, group_type, acronym):
         if form.is_valid():
             instructions = form.cleaned_data['instructions']
 
-            email_secretariat(request, group, "Request closing of group", instructions)
+            email_iesg_secretary_re_charter(request, group, "Request closing of group", instructions)
 
             e = GroupEvent(group=group, by=request.user.person)
             e.type = "requested_close"

ietf/group/mails.py

@@ -13,13 +13,13 @@
 from ietf.group.models import Group
 from ietf.group.utils import milestone_reviewer_for_group_type
 
-def email_secretariat(request, group, subject, text):
+def email_iesg_secretary_re_charter(request, group, subject, text):
     to = ["iesg-secretary@ietf.org"]
     full_subject = u"Regarding %s %s: %s" % (group.type.name, group.acronym, subject)
     text = strip_tags(text)
 
     send_mail(request, to, None, full_subject,
-              "group/email_secretariat.txt",
+              "group/email_iesg_secretary_re_charter.txt",
               dict(text=text,
                    group=group,
                    group_url=settings.IDTRACKER_BASE_URL + urlreverse('group_charter', kwargs=dict(group_type=group.type_id, acronym=group.acronym)),

…tf/templates/group/email_secretariat.txt …roup/email_iesg_secretary_re_charter.txtietf/templates/group/email_secretariat.txt renamed to ietf/templates/group/email_iesg_secretary_re_charter.txt ietf/templates/group/email_secretariat.txt renamed to ietf/templates/group/email_iesg_secretary_re_charter.txt

@@ -360,6 +360,8 @@ def smtp_error_logging(thing):
 
         send_error_to_secretariat(msg)
 
+
+
 def send_error_to_secretariat(msg):
 
     debugging = getattr(settings, "USING_DEBUG_EMAIL_SERVER", False) and settings.EMAIL_HOST == 'localhost' and settings.EMAIL_PORT == 2025