purged email_ad

 - Legacy-Id: 10067

Author: rjsparks

ietf/doc/mails.py

@@ -67,24 +67,18 @@ def email_pulled_from_rfc_queue(request, doc, comment, prev_state, next_state):
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),
               extra=extra)
 
+def email_iesg_processing_document(request, doc, changes):
+    addrs = gather_address_lists('doc_iesg_processing_started',doc=doc)
+    send_mail(request, addrs.to, None,
+              'IESG processing details changed for %s' % doc.name,
+              'doc/mail/email_iesg_processing.txt', 
+              dict(doc=doc,
+                   changes=changes),
+              cc=addrs.cc)
+
 def html_to_text(html):
     return strip_tags(html.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&").replace("<br>", "\n"))
 
-#TODO Expunge this
-def email_ad(request, doc, ad, changed_by, text, subject=None):
-    if not ad or not changed_by or ad == changed_by:
-        return
-
-    to = ad.role_email("ad").formatted_email()
-    send_mail(request, to,
-              "DraftTracker Mail System <iesg-secretary@ietf.org>",
-              "%s updated by %s" % (doc.file_tag(), changed_by.plain_name()),
-              "doc/mail/change_notice.txt",
-              dict(text=html_to_text(text),
-                   doc=doc,
-                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
-
-
 def generate_ballot_writeup(request, doc):
     e = doc.latest_event(type="iana_review")
     iana = e.desc if e else ""

ietf/doc/tests_draft.py

@@ -373,7 +373,9 @@ def test_start_iesg_process_on_draft(self):
         self.assertEqual(draft.docevent_set.count(), events_before + 3)
         events = list(draft.docevent_set.order_by('time', 'id'))
         self.assertEqual(events[-3].type, "started_iesg_process")
-        self.assertEqual(len(outbox), mailbox_before)
+        self.assertEqual(len(outbox), mailbox_before+1)
+        self.assertTrue('IESG processing' in outbox[-1]['Subject'])
+        self.assertTrue('draft-ietf-mars-test2@' in outbox[-1]['To']) 
 
         # Redo, starting in publication requested to make sure WG state is also set
         draft.unset_state('draft-iesg')

ietf/doc/views_draft.py

@@ -16,10 +16,11 @@
 from ietf.doc.models import ( Document, DocAlias, RelatedDocument, State,
     StateType, DocEvent, ConsensusDocEvent, TelechatDocEvent, WriteupDocEvent, IESG_SUBSTATE_TAGS,
     save_document_in_history )
-from ietf.doc.mails import ( email_ad, email_pulled_from_rfc_queue, email_resurrect_requested,
+from ietf.doc.mails import ( email_pulled_from_rfc_queue, email_resurrect_requested,
     email_resurrection_completed, email_state_changed, email_stream_changed,
     email_stream_state_changed, email_stream_tags_changed, extra_automation_headers,
-    generate_publication_request, email_adopted, email_intended_status_changed )
+    generate_publication_request, email_adopted, email_intended_status_changed,
+    email_iesg_processing_document )
 from ietf.doc.utils import ( add_state_change_event, can_adopt_draft,
     get_tags_for_stream_id, nice_consensus,
     update_reminder, update_telechat, make_notify_changed_event, get_initial_notify,
@@ -669,8 +670,6 @@ def edit_info(request, name):
                 e.desc = "IESG process started in state <b>%s</b>" % doc.get_state("draft-iesg").name
                 e.save()
 
-            orig_ad = doc.ad
-
             changes = []
 
             def desc(attr, new, old):
@@ -720,14 +719,14 @@ def diff(attr, name):
                 e.type = "changed_document"
                 e.save()
 
+            # Todo - chase this
             update_telechat(request, doc, login,
                             r['telechat_date'], r['returning_item'])
 
             doc.time = datetime.datetime.now()
 
-            if changes and not new_document:
-                #TODO - use the 'this thing changed' messages instead
-                email_ad(request, doc, orig_ad, login, "\n".join(changes))
+            if changes:
+                email_iesg_processing_document(request, doc, changes)
 
             doc.save()
             return HttpResponseRedirect(doc.get_absolute_url())

ietf/mailtoken/migrations/0002_auto_20150809_1314.py

@@ -822,6 +822,14 @@ def mt_factory(slug,desc,to_slugs,cc_slugs=[]):
                          'doc_non_ietf_stream_manager',
                         ])
 
+    mt_factory(slug='doc_iesg_processing_started',
+               desc="Recipients for a message when the IESG begins processing a document ",
+               to_slugs=['doc_authors',
+                         'doc_ad',
+                         'doc_shepherd',
+                         'doc_group_chairs',
+                        ])
+
 def forward(apps, schema_editor):
 
     make_recipients(apps)

ietf/name/fixtures/names.json

@@ -5082,6 +5082,20 @@
  "model": "mailtoken.mailtoken",
  "pk": "doc_iana_state_changed"
 },
+{
+ "fields": {
+  "cc": [],
+  "to": [
+   "doc_ad",
+   "doc_authors",
+   "doc_group_chairs",
+   "doc_shepherd"
+  ],
+  "desc": "Recipients for a message when the IESG begins processing a document "
+ },
+ "model": "mailtoken.mailtoken",
+ "pk": "doc_iesg_processing_started"
+},
 {
  "fields": {
   "cc": [],

ietf/templates/doc/mail/email_iesg_processing.txt

@@ -0,0 +1,15 @@
+{% autoescape off %}
+Please DO NOT reply to this email.
+
+The IESG is processing {{doc.name}}.
+
+The following changes have been made:
+
+{% for change in changes %}{{change}}
+{% endfor %}
+
+The document can be found here:
+I-D: {{ doc.file_tag|safe }}
+ID Tracker URL: {{ url }}
+
+{% endautoescape%}