Fixup bugs in chartering a new WG

- Legacy-Id: 4287

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

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

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)