From 883853f09c14710045acbf57d6b650803107ae07 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 11 Dec 2013 16:43:34 +0000 Subject: [PATCH] Fix bug, TemplateView takes template_name, not template as parameter - Legacy-Id: 6880 --- ietf/liaisons/urls.py | 10 +++++----- ietf/nomcom/urls.py | 2 +- ietf/secr/urls.py | 2 +- ietf/urls.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py index c941065bd..e9aa3c170 100644 --- a/ietf/liaisons/urls.py +++ b/ietf/liaisons/urls.py @@ -1,13 +1,13 @@ # Copyright The IETF Trust 2007, All Rights Reserved from django.conf.urls import patterns, url -from django.views.generic import RedirectView,TemplateView +from django.views.generic import RedirectView, TemplateView urlpatterns = patterns('', - (r'^help/$', TemplateView.as_view(template='liaisons/help.html')), - (r'^help/fields/$', TemplateView.as_view(template='liaisons/field_help.html')), - (r'^help/from_ietf/$', TemplateView.as_view(template='liaisons/guide_from_ietf.html')), - (r'^help/to_ietf/$', TemplateView.as_view(template='liaisons/guide_to_ietf.html')), + (r'^help/$', TemplateView.as_view(template_name='liaisons/help.html')), + (r'^help/fields/$', TemplateView.as_view(template_name='liaisons/field_help.html')), + (r'^help/from_ietf/$', TemplateView.as_view(template_name='liaisons/guide_from_ietf.html')), + (r'^help/to_ietf/$', TemplateView.as_view(template_name='liaisons/guide_to_ietf.html')), (r'^managers/$', RedirectView.as_view(url='http://www.ietf.org/liaison/managers.html')), ) diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py index e297b31c1..5b864b9e0 100644 --- a/ietf/nomcom/urls.py +++ b/ietf/nomcom/urls.py @@ -26,7 +26,7 @@ urlpatterns = patterns('ietf.nomcom.views', url(r'^(?P\d{4})/private/edit-chair/$', EditChairFormPreview(EditChairForm), name='nomcom_edit_chair'), url(r'^(?P\d{4})/private/edit-nomcom/$', 'edit_nomcom', name='nomcom_edit_nomcom'), url(r'^(?P\d{4})/private/delete-nomcom/$', 'delete_nomcom', name='nomcom_delete_nomcom'), - url(r'^deleted/$', TemplateView.as_view(template='nomcom/deleted.html'), name='nomcom_deleted'), + url(r'^deleted/$', TemplateView.as_view(template_name='nomcom/deleted.html'), name='nomcom_deleted'), url(r'^(?P\d{4})/private/chair/templates/$', 'list_templates', name='nomcom_list_templates'), url(r'^(?P\d{4})/private/chair/templates/(?P\d+)/$', 'edit_template', name='nomcom_edit_template'), url(r'^(?P\d{4})/private/chair/position/$', 'list_positions', name='nomcom_list_positions'), diff --git a/ietf/secr/urls.py b/ietf/secr/urls.py index 5d405e551..d1bb0deff 100644 --- a/ietf/secr/urls.py +++ b/ietf/secr/urls.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url from django.views.generic import TemplateView urlpatterns = patterns('', - url(r'^$', TemplateView.as_view(template='main.html'), name="home"), + url(r'^$', TemplateView.as_view(template_name='main.html'), name="home"), (r'^announcement/', include('ietf.secr.announcement.urls')), (r'^areas/', include('ietf.secr.areas.urls')), (r'^console/', include('ietf.secr.console.urls')), diff --git a/ietf/urls.py b/ietf/urls.py index 556e02e31..4e6141b0a 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -80,7 +80,7 @@ urlpatterns = patterns('', (r'^(?Ppublic)/', include('ietf.redirects.urls')), # Google webmaster tools verification url - (r'^googlea30ad1dacffb5e5b.html', TemplateView.as_view(template='googlea30ad1dacffb5e5b.html')), + (r'^googlea30ad1dacffb5e5b.html', TemplateView.as_view(template_name='googlea30ad1dacffb5e5b.html')), (r'^%s/' % settings.DAJAXICE_MEDIA_PREFIX, include('dajaxice.urls')), )