From 7538eab96f54b3ff44af73960096d01675c54e2c Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 19 Jun 2012 18:48:02 +0000
Subject: [PATCH] Fix flow of approval of charters/announcement of the WG
 action based on feedback from Cindy Morgan, now there's a link on the
 approval page to go to the edit page which sends you back upon saving, and
 the edit page doesn't provide a button to send the announcement since you
 should do that on the approve page (instead it provides a link).  -
 Legacy-Id: 4474

---
 ietf/templates/wgcharter/announcement_text.html | 10 ++++++++--
 ietf/templates/wgcharter/approve.html           |  3 ++-
 ietf/wgcharter/urls.py                          |  2 +-
 ietf/wgcharter/views.py                         |  6 +++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ietf/templates/wgcharter/announcement_text.html b/ietf/templates/wgcharter/announcement_text.html
index 168d23c64..38113ef51 100644
--- a/ietf/templates/wgcharter/announcement_text.html
+++ b/ietf/templates/wgcharter/announcement_text.html
@@ -18,14 +18,20 @@ form #id_announcement_text {
 
   <div class="actions">
     <a href="{{ back_url }}">Back</a>
-    <input type="submit" name="save_text" value="Save WG {{ announcement }} announcement text" />
-    <input type="submit" name="regenerate_text" value="Regenerate {{ announcement }} text" />
+    <input type="submit" name="regenerate_text" value="Regenerate" />
+    <input type="submit" name="save_text" value="Save" />
   </div>
 
 {% load ietf_filters %}
 {% if user|has_role:"Secretariat" %}
+  <h3>Secretariat actions</h3>
+
   <div class="actions">
+    {% if announcement == "action" %}
+    <a href="{% url charter_approve name=charter.canonical_name %}">Go to charter approval page</a>
+    {% else %}
     <input type="submit" name="send_text" value="Send WG {{ announcement }} announcement" />
+    {% endif %}
   </div>
 {% endif %}
 
diff --git a/ietf/templates/wgcharter/approve.html b/ietf/templates/wgcharter/approve.html
index 1fba5eed5..5287aec47 100644
--- a/ietf/templates/wgcharter/approve.html
+++ b/ietf/templates/wgcharter/approve.html
@@ -19,7 +19,7 @@ form.approve .announcement {
 {% endblock %}
 
 {% block content %}
-<h1>Approve {{ charter.canonical_name }}</h1>
+<h1>Approve {{ charter.canonical_name }}-{{ charter.rev }}</h1>
 
 <div>IETF announcement:</div>
 
@@ -31,6 +31,7 @@ form.approve .announcement {
 
   <div class="actions">
     <a href="{% url doc_view name=charter.name %}">Back</a>
+    <a href="{% url charter_edit_announcement name=charter.canonical_name,ann="action" %}?next=approve">Go to edit/regenerate announcement page</a>
     <input type="submit" value="Send out the announcement, close ballot and update revision"/>
   </div>
 </form>
diff --git a/ietf/wgcharter/urls.py b/ietf/wgcharter/urls.py
index 2aa4c955f..e9b04b5ec 100644
--- a/ietf/wgcharter/urls.py
+++ b/ietf/wgcharter/urls.py
@@ -7,7 +7,7 @@ urlpatterns = patterns('',
     url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.wgcharter.views.change_state", name='charter_startstop_process'),
     url(r'^telechat/$', "ietf.wgcharter.views.telechat_date", name='charter_telechat_date'),
     url(r'^notify/$', "ietf.wgcharter.views.edit_notify", name='charter_edit_notify'),
-    url(r'^(?P<ann>action|review)/$', "ietf.wgcharter.views.announcement_text"),
+    url(r'^(?P<ann>action|review)/$', "ietf.wgcharter.views.announcement_text", name="charter_edit_announcement"),
     url(r'^ballotwriteupnotes/$', "ietf.wgcharter.views.ballot_writeupnotes"),
     url(r'^approve/$', "ietf.wgcharter.views.approve", name='charter_approve'),
     url(r'^submit/$', "ietf.wgcharter.views.submit", name='charter_submit'),
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
index e6d301cda..2ec85cd40 100644
--- a/ietf/wgcharter/views.py
+++ b/ietf/wgcharter/views.py
@@ -397,7 +397,11 @@ def announcement_text(request, name, ann):
                 
                 charter.time = e.time
                 charter.save()
-            return redirect('doc_writeup', name=charter.name)
+
+            if request.GET.get("next", "") == "approve":
+                return redirect('charter_approve', name=charter.canonical_name())
+
+            return redirect('doc_writeup', name=charter.canonical_name())
 
         if "regenerate_text" in request.POST:
             if ann == "action":