From 88d083ff7269259c46cc2c1829b0c1068dddcf07 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Mon, 7 May 2012 17:18:45 +0000
Subject: [PATCH] Turn chartering process around so one submits the charter
 text before putting the charter document into the review state and emailing
 the Secretariat.  - Legacy-Id: 4404

---
 ietf/templates/idrfc/document_charter.html | 4 ++--
 ietf/templates/wgcharter/change_state.html | 2 +-
 ietf/wgcharter/urls.py                     | 1 +
 ietf/wgcharter/views.py                    | 9 +++++----
 ietf/wginfo/edit.py                        | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ietf/templates/idrfc/document_charter.html b/ietf/templates/idrfc/document_charter.html
index 9aae9ec31..a600b5614 100644
--- a/ietf/templates/idrfc/document_charter.html
+++ b/ietf/templates/idrfc/document_charter.html
@@ -53,9 +53,9 @@
 
         {% else %}
           {% if group.state_id == "proposed" or group.state_id == "bof" %}
-          - <a href="{% url charter_startstop_process name=doc.name option='initcharter' %}">Charter</a>
+          - <a href="{% url charter_submit name=doc.name option='initcharter' %}">Start chartering</a>
           {% else %}
-          - <a href="{% url charter_startstop_process name=doc.name option='recharter' %}">Recharter</a>
+          - <a href="{% url charter_submit name=doc.name option='recharter' %}">Recharter</a>
           {% endif %}
         {% endif %}
 
diff --git a/ietf/templates/wgcharter/change_state.html b/ietf/templates/wgcharter/change_state.html
index 00ba730af..f775bb0a7 100644
--- a/ietf/templates/wgcharter/change_state.html
+++ b/ietf/templates/wgcharter/change_state.html
@@ -63,7 +63,7 @@ form.change-state .actions {
     <tr>
       <td colspan="2" class="actions">
         {% if option == "initcharter" or option == "recharter" %}
-        <input type="submit" value="Save and continue to submission of charter text"/>
+        <input type="submit" value="Initiate chartering"/>
         {% endif %}
         {% if not option or option == "abandon" %}
         <a href="{% url doc_view name=doc.name %}">Back</a>
diff --git a/ietf/wgcharter/urls.py b/ietf/wgcharter/urls.py
index ec01728c7..2aa4c955f 100644
--- a/ietf/wgcharter/urls.py
+++ b/ietf/wgcharter/urls.py
@@ -11,4 +11,5 @@ urlpatterns = patterns('',
     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'),
+    url(r'^submit/(?P<option>initcharter|recharter)/$', "ietf.wgcharter.views.submit", name='charter_submit'),
 )
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
index 3196b0f68..098867a8b 100644
--- a/ietf/wgcharter/views.py
+++ b/ietf/wgcharter/views.py
@@ -132,8 +132,6 @@ def change_state(request, name, option=None):
                 e.desc = "Initial review time expires %s" % e.expires.strftime("%Y-%m-%d")
                 e.save()
 
-            if option in ("initcharter", "recharter"):
-                return redirect('charter_submit', name=charter.name)
             return redirect('doc_view', name=charter.name)
     else:
         if option == "recharter":
@@ -289,7 +287,7 @@ class UploadForm(forms.Form):
                 destination.write(self.cleaned_data['content'])
 
 @role_required('Area Director','Secretariat')
-def submit(request, name):
+def submit(request, name, option=None):
     charter = get_object_or_404(Document, type="charter", name=name)
     wg = charter.group
 
@@ -328,7 +326,10 @@ def submit(request, name):
             charter.time = datetime.datetime.now()
             charter.save()
 
-            return HttpResponseRedirect(reverse('doc_view', kwargs={'name': charter.name}))
+            if option:
+                return redirect('charter_startstop_process', name=charter.name, option=option)
+            else:
+                return redirect("doc_view", name=charter.name)
     else:
         init = { "content": ""}
         c = charter
diff --git a/ietf/wginfo/edit.py b/ietf/wginfo/edit.py
index 6d0340d18..ebc616867 100644
--- a/ietf/wginfo/edit.py
+++ b/ietf/wginfo/edit.py
@@ -241,7 +241,7 @@ def edit(request, acronym=None, action="edit"):
             wg.save()
 
             if new_wg:
-                return redirect('charter_startstop_process', name=wg.charter.name, option="initcharter")
+                return redirect('charter_submit', name=wg.charter.name, option="initcharter")
 
             return redirect('wg_charter', acronym=wg.acronym)
     else: # form.is_valid()