From bba097d03c308b8cc852fd649f97a45286a265e1 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 17 Apr 2012 18:08:04 +0000
Subject: [PATCH] Fixup bugs in chartering a new WG  - Legacy-Id: 4287

---
 ietf/templates/idrfc/document_charter.html | 13 ++++++++++---
 ietf/wginfo/edit.py                        |  2 +-
 ietf/wginfo/tests.py                       |  1 -
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ietf/templates/idrfc/document_charter.html b/ietf/templates/idrfc/document_charter.html
index 254a2e946..7529be067 100644
--- a/ietf/templates/idrfc/document_charter.html
+++ b/ietf/templates/idrfc/document_charter.html
@@ -87,16 +87,23 @@
 
 <p>Other versions: <a href="{{ txt_url }}">plain text</a></p>
 
-<h3>Charter {{ doc.name }}-{{ doc.rev }}
+<h3>
+{% if doc.rev %}
+  Charter {{ doc.name }}-{{ doc.rev }}
+{% else %}
+  No text for {{ doc.name }} submitted yet
+{% endif %}
+
 {% if user|has_role:"Area Director,Secretariat" and chartering and doc.group.state_id != "conclude" %}
-<a class="edit" href="{% url wg_submit name=doc.name %}">Edit charter text</a>
+<a class="edit" href="{% url wg_submit name=doc.name %}">Change charter text</a>
 {% endif %}
 </h3>
 
+{% if doc.rev %}
 <div class="markup_draft">
 {{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
 </div>
-
+{% endif %}
 
 {% endblock %}
 
diff --git a/ietf/wginfo/edit.py b/ietf/wginfo/edit.py
index 5cdc99da2..6a2adeb74 100644
--- a/ietf/wginfo/edit.py
+++ b/ietf/wginfo/edit.py
@@ -189,7 +189,7 @@ def edit(request, acronym=None, action="edit"):
             wg.save()
 
             if new_wg:
-                return redirect('wg_startstop_process', name=wg.acronym, option="initcharter")
+                return redirect('wg_startstop_process', name=wg.charter.name, option="initcharter")
 
             return redirect('wg_charter', acronym=wg.acronym)
     else: # form.is_valid()
diff --git a/ietf/wginfo/tests.py b/ietf/wginfo/tests.py
index b46acd6ee..8e3f23d99 100644
--- a/ietf/wginfo/tests.py
+++ b/ietf/wginfo/tests.py
@@ -76,7 +76,6 @@ class WgOverviewTestCase(django.test.TestCase):
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
         q = PyQuery(r.content)
-        print
         self.assertEquals(len(q('table.ietf-doctable td.acronym a:contains("mars")')), 1)