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
This commit is contained in:
Henrik Levkowetz 2014-02-04 22:00:07 +00:00
parent 35cadc1763
commit 41c1c1a5fe
3 changed files with 0 additions and 20 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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 %}