From 25cb532348c188c7093830e3076a3105a6554897 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 3 Apr 2012 16:46:23 +0000
Subject: [PATCH] Move last call announcement text to last call event rather
 than stuffing it inside the state change event.  - Legacy-Id: 4253

---
 ietf/idrfc/utils.py        | 7 -------
 ietf/idrfc/views_ballot.py | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ietf/idrfc/utils.py b/ietf/idrfc/utils.py
index a9f5a6138..f19c25aa0 100644
--- a/ietf/idrfc/utils.py
+++ b/ietf/idrfc/utils.py
@@ -79,13 +79,6 @@ def log_state_changedREDESIGN(request, doc, by, prev_iesg_state, prev_iesg_tag):
     e = DocEvent(doc=doc, by=by)
     e.type = "changed_document"
     e.desc = u"State changed to <b>%s</b> from %s" % (state_name, prev_state_name)
-
-    if state.slug == "lc":
-        writeup = doc.latest_event(WriteupDocEvent, type="changed_last_call_text")
-        if writeup and writeup.text:
-            e.desc += "<br><br><b>The following Last Call Announcement was sent out:</b><br><br>"
-            e.desc += writeup.text.replace("\n", "<br><br>")
-
     e.save()
     return e
 
diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py
index cb090fc9e..416284253 100644
--- a/ietf/idrfc/views_ballot.py
+++ b/ietf/idrfc/views_ballot.py
@@ -1393,7 +1393,9 @@ def make_last_callREDESIGN(request, name):
             
             e = LastCallDocEvent(doc=doc, by=login)
             e.type = "sent_last_call"
-            e.desc = "Last call sent"
+            e.desc = "The following Last Call announcement was sent out:<br><br>"
+            e.desc += announcement
+
             if form.cleaned_data['last_call_sent_date'] != e.time.date():
                 e.time = datetime.datetime.combine(form.cleaned_data['last_call_sent_date'], e.time.time())
             e.expires = form.cleaned_data['last_call_expiration_date']