diff --git a/ietf/idrfc/urls.py b/ietf/idrfc/urls.py index 191ea7e44..eaa12355f 100644 --- a/ietf/idrfc/urls.py +++ b/ietf/idrfc/urls.py @@ -32,6 +32,7 @@ from django.conf.urls.defaults import patterns, url, include from ietf.idrfc import views_doc, views_search, views_edit, views_ballot, views +from ietf.doc.models import State urlpatterns = patterns('', (r'^/?$', views_search.search_main), @@ -68,3 +69,9 @@ urlpatterns = patterns('', (r'^(?P[A-Za-z0-9.-]+)/charter/', include('ietf.wgcharter.urls')), ) + +urlpatterns += patterns('django.views.generic.simple', + url(r'^help/state/charter/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'), +) + + diff --git a/ietf/templates/idrfc/document_charter.html b/ietf/templates/idrfc/document_charter.html index 1d2fd65b9..f1e5f4072 100644 --- a/ietf/templates/idrfc/document_charter.html +++ b/ietf/templates/idrfc/document_charter.html @@ -34,7 +34,7 @@ {{ group.state.name }} - Charter State: + Charter State:
{{ doc.get_state.name }} diff --git a/ietf/wgcharter/urls.py b/ietf/wgcharter/urls.py index 1673cc92c..79ee1c247 100644 --- a/ietf/wgcharter/urls.py +++ b/ietf/wgcharter/urls.py @@ -1,12 +1,8 @@ # Copyright The IETF Trust 2011, All Rights Reserved from django.conf.urls.defaults import patterns, url -from ietf.doc.models import State -urlpatterns = patterns('django.views.generic.simple', - url(r'^help/state/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'), -) -urlpatterns += patterns('', +urlpatterns = patterns('', url(r'^state/$', "ietf.wgcharter.views.change_state", name='charter_change_state'), url(r'^(?P