From 41c1c1a5fec81c7344a4cd335f5a9b413adf1231 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 4 Feb 2014 22:00:07 +0000 Subject: [PATCH] Removing the extra (misleading) draft about WG adoption which is sent out in addition to the state change emails when a call for addoption (WG) or adoption (RG) is done using the 'Adopt Draft in Group' form. The state change messages should be sufficient, and are not misleading. Fixes issue #1246 (and 1290). - Legacy-Id: 7206 --- ietf/doc/mails.py | 10 ---------- ietf/doc/views_draft.py | 2 -- ietf/templates/doc/mail/draft_adopted_email.txt | 8 -------- 3 files changed, 20 deletions(-) delete mode 100644 ietf/templates/doc/mail/draft_adopted_email.txt diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index 6a0466f9b..165895b45 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -433,16 +433,6 @@ def stream_state_email_recipients(doc, extra_recipients=[]): return res -def email_draft_adopted(request, doc, by, comment): - recipients = stream_state_email_recipients(doc) - send_mail(request, recipients, settings.DEFAULT_FROM_EMAIL, - u"%s adopted in %s %s" % (doc.name, doc.group.acronym, doc.group.type.name), - 'doc/mail/draft_adopted_email.txt', - dict(doc=doc, - url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(), - by=by, - comment=comment)) - def email_stream_state_changed(request, doc, prev_state, new_state, by, comment=""): recipients = stream_state_email_recipients(doc) diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index ab74a1e30..ffde2c204 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -1335,8 +1335,6 @@ def adopt_draft(request, name): e.desc = comment e.save() - email_draft_adopted(request, doc, by, comment) - return HttpResponseRedirect(doc.get_absolute_url()) else: form = AdoptDraftForm(user=request.user) diff --git a/ietf/templates/doc/mail/draft_adopted_email.txt b/ietf/templates/doc/mail/draft_adopted_email.txt deleted file mode 100644 index 1e01fb13d..000000000 --- a/ietf/templates/doc/mail/draft_adopted_email.txt +++ /dev/null @@ -1,8 +0,0 @@ -{% autoescape off %}{% filter wordwrap:73 %} -The document {{ doc }} has been adopted in the {{ doc.group.acronym }} {{ doc.group.type.name }} by {{ by }}: - -{{ url }} -{% if comment %} - -Comment: -{{ comment }}{% endif %}{% endfilter %}{% endautoescape %}