From 802ee2905dac770c65776d61b820c69ad904556e Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 14 Jun 2012 20:32:35 +0000
Subject: [PATCH] Quick fix for crash when going to /wg/imapmove/charter/.  I'm
 not happy about the 'charter-ietf-' constant which now appears several places
 in the code; we need settings which defines the correct name pattern for
 different document types (or a table or table column, maybe).  But this
 hopefully will make it possible to continue processing proposed WGs ...  -
 Legacy-Id: 4459

---
 ietf/templates/wginfo/wg_charterREDESIGN.html | 2 +-
 ietf/wgcharter/views.py                       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/wginfo/wg_charterREDESIGN.html b/ietf/templates/wginfo/wg_charterREDESIGN.html
index d5bd94391..3076315d8 100644
--- a/ietf/templates/wginfo/wg_charterREDESIGN.html
+++ b/ietf/templates/wginfo/wg_charterREDESIGN.html
@@ -72,7 +72,7 @@ is occasionally incorrect.</span>
       {% else %}
       none
       {% if user|has_role:"Area Director,Secretariat" %}
-      - <a href="{% url wgcharter.views_submit.submit name=wg.acronym %}">Submit Charter</a>
+      - <a href="{% url wgcharter.views.submit acronym=wg.acronym %}">Submit Charter</a>
       {% endif %}
       {% endif %}
     </td>
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
index b68634330..e6d301cda 100644
--- a/ietf/wgcharter/views.py
+++ b/ietf/wgcharter/views.py
@@ -287,7 +287,9 @@ class UploadForm(forms.Form):
                 destination.write(self.cleaned_data['content'])
 
 @role_required('Area Director','Secretariat')
-def submit(request, name, option=None):
+def submit(request, name=None, acronym=None, option=None):
+    if acronym and not name:
+        name = "charter-ietf-" + acronym
     charter = get_object_or_404(Document, type="charter", name=name)
     wg = charter.group