From c106657ce5ba3a6bd24f593247c0d8ea726cb384 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 9 Nov 2016 22:10:45 +0100 Subject: [PATCH] Fix deprecation errors by providing app_nam in urls.py See https://docs.djangoproject.com/en/1.10/topics/http/urls/#namespaces-and-include --- website/activemembers/urls.py | 1 + website/documents/urls.py | 1 + website/education/urls.py | 1 + website/events/urls.py | 2 ++ website/mailinglists/urls.py | 2 ++ website/members/urls.py | 6 +++++- website/merchandise/urls.py | 2 ++ website/newsletters/urls.py | 2 ++ website/partners/urls.py | 1 + website/photos/urls.py | 2 ++ website/pizzas/urls.py | 2 ++ website/thabloid/urls.py | 2 ++ website/thaliawebsite/urls.py | 25 ++++++++++++------------- 13 files changed, 35 insertions(+), 14 deletions(-) diff --git a/website/activemembers/urls.py b/website/activemembers/urls.py index fbd8b3a5..bb69207c 100644 --- a/website/activemembers/urls.py +++ b/website/activemembers/urls.py @@ -6,6 +6,7 @@ from django.conf.urls import url from . import views +app_name = "activemembers" urlpatterns = [ url(r'committees/$', views.committee_index, name='committees'), url(r'^committees/(?P\d)/$', views.committee_detail, name='committee'), diff --git a/website/documents/urls.py b/website/documents/urls.py index 2d5916a8..aa174a94 100644 --- a/website/documents/urls.py +++ b/website/documents/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import include, url from . import views app_name = "documents" + urlpatterns = [ url('^miscellaneous/(?P[0-9]*)', views.get_miscellaneous_document, name='miscellaneous-document'), diff --git a/website/education/urls.py b/website/education/urls.py index 60fa6cd9..38dc4325 100644 --- a/website/education/urls.py +++ b/website/education/urls.py @@ -4,6 +4,7 @@ from django.views.generic.base import RedirectView from . import views app_name = "education" + urlpatterns = [ url('^exam/(?P[0-9]*)/$', views.exam, name="exam"), url('^summary/(?P[0-9]*)/$', views.summary, name="summary"), diff --git a/website/events/urls.py b/website/events/urls.py index 3e5c9273..513fe934 100644 --- a/website/events/urls.py +++ b/website/events/urls.py @@ -8,6 +8,8 @@ from events.feeds import EventFeed from . import views +app_name = "events" + urlpatterns = [ url(r'admin/(?P\d+)/$', views.admin_details, name='admin-details'), url(r'admin/(?P\d+)/registration/(?P[-\w]+)/$', diff --git a/website/mailinglists/urls.py b/website/mailinglists/urls.py index b12db577..d29fc87c 100644 --- a/website/mailinglists/urls.py +++ b/website/mailinglists/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import include, url from . import views +app_name = "mailinglists" + urlpatterns = [ url('^', views.index, name='index'), ] diff --git a/website/members/urls.py b/website/members/urls.py index 3832b50e..7bfb6163 100644 --- a/website/members/urls.py +++ b/website/members/urls.py @@ -2,8 +2,12 @@ from django.conf.urls import url from . import views +app_name = "members" + urlpatterns = [ - url('^become-a-member-document/(?P[0-9]*)', views.get_become_a_member_document, name='become-a-member-document'), + url('^become-a-member-document/(?P[0-9]*)', + views.get_become_a_member_document, + name='become-a-member-document'), url('^profile/(?P[0-9]*)$', views.profile, name='profile'), url('^profile$', views.profile, name='profile'), url('^profile/edit/$', views.edit_profile, name='edit-profile'), diff --git a/website/merchandise/urls.py b/website/merchandise/urls.py index a3780aa2..ff90dd02 100644 --- a/website/merchandise/urls.py +++ b/website/merchandise/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "merchandise" + urlpatterns = [ url(r'^$', views.index, name='index'), ] diff --git a/website/newsletters/urls.py b/website/newsletters/urls.py index a3b15b15..2efb662b 100644 --- a/website/newsletters/urls.py +++ b/website/newsletters/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "newsletters" + urlpatterns = [ url('^(?P\d+)/$', views.preview, name='preview'), url(r'admin/send/(?P\d+)/$', views.admin_send, name='admin-send'), diff --git a/website/partners/urls.py b/website/partners/urls.py index 0d2fb1b2..a122840a 100644 --- a/website/partners/urls.py +++ b/website/partners/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import url from . import views app_name = "partners" + urlpatterns = [ url(r'^$', views.index, name='index'), url(r'^partners/(?P[-\w]+)$', views.partner, name='partner'), diff --git a/website/photos/urls.py b/website/photos/urls.py index 28322967..2a9ec570 100644 --- a/website/photos/urls.py +++ b/website/photos/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "photos" + urlpatterns = [ url(r'^download/(?P.*)', views.download, name='download'), url(r'^shared-download/(?P[-\w]+)/(?P[a-zA-Z0-9]+)/(?P.*)', views.shared_download, name='shared-download'), diff --git a/website/pizzas/urls.py b/website/pizzas/urls.py index 5bb7885e..29779fba 100644 --- a/website/pizzas/urls.py +++ b/website/pizzas/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "pizzas" + urlpatterns = [ url(r'^delete-order/$', views.delete_order, name='delete-order'), url(r'^add-order/(?P\d+)/$', views.add_order, name='add-order'), diff --git a/website/thabloid/urls.py b/website/thabloid/urls.py index 40f2b485..fa0dda47 100644 --- a/website/thabloid/urls.py +++ b/website/thabloid/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from . import views +app_name = "thabloid" + urlpatterns = [ url(r'^$', views.index, name='index'), url(r'^viewer/(?P[0-9]{4})/(?P[0-9]+)/$', views.viewer, name='viewer'), diff --git a/website/thaliawebsite/urls.py b/website/thaliawebsite/urls.py index e62e6d2f..62254551 100644 --- a/website/thaliawebsite/urls.py +++ b/website/thaliawebsite/urls.py @@ -50,33 +50,32 @@ thalia_sitemap.update(partners_sitemap) urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='index.html'), name='index'), url(r'^admin/', admin.site.urls), - url(r'^mailinglists/', include('mailinglists.urls', namespace='mailinglists')), - url(r'^members/', include('members.urls', namespace='members')), + url(r'^mailinglists/', include('mailinglists.urls')), + url(r'^members/', include('members.urls')), url(r'^nyi$', TemplateView.as_view(template_name='status/nyi.html'), name='#'), - url(r'^events/', include('events.urls', namespace='events')), - url(r'^pizzas/', include('pizzas.urls', namespace='pizzas')), + url(r'^events/', include('events.urls')), + url(r'^pizzas/', include('pizzas.urls')), url(r'^index\.php/events/ical/feed\.ics', DeprecationFeed()), - url(r'^newsletters/', include('newsletters.urls', - namespace='newsletters')), + url(r'^newsletters/', include('newsletters.urls')), url(r'^association$', TemplateView.as_view( template_name='singlepages/association.html'), name='association'), url(r'^association/', include([ - url(r'^activemembers/', include('activemembers.urls', namespace='activemembers')), - url(r'^merchandise/', include('merchandise.urls', namespace='merchandise')), - url(r'^documents/', include('documents.urls', namespace='documents')), + url(r'^activemembers/', include('activemembers.urls')), + url(r'^merchandise/', include('merchandise.urls')), + url(r'^documents/', include('documents.urls')), url(r'^become-a-member/', members.views.become_a_member, name='become-a-member'), url(r'^sister-associations', TemplateView.as_view(template_name='singlepages/sister_associations.html'), name='sister-associations'), - url(r'^thabloid/', include('thabloid.urls', namespace='thabloid')), + url(r'^thabloid/', include('thabloid.urls')), ])), url(r'^for-members$', TemplateView.as_view( template_name='singlepages/for_members.html'), name='for-members'), url(r'^for-members/', include([ url(r'^become-active', TemplateView.as_view(template_name='singlepages/become_active.html'), name='become-active'), - url(r'^photos/', include('photos.urls', namespace='photos')), + url(r'^photos/', include('photos.urls')), url(r'^statistics/', members.views.statistics, name='statistics'), url(r'^styleguide/', TemplateView.as_view(template_name='singlepages/styleguide.html'), name='styleguide'), ])), - url(r'^career/', include('partners.urls', namespace='partners')), + url(r'^career/', include('partners.urls')), url(r'^contact$', TemplateView.as_view(template_name='singlepages/contact.html'), name='contact'), url(r'^private-thumbnails/(?P\d+x\d+_[01])/(?P.*)', private_thumbnails, name='private-thumbnails'), url(r'^generate-thumbnail/(?P\d+x\d+_[01])/(?P[^/]+)/(?P[^/]+)', generate_thumbnail, name='generate-thumbnail'), @@ -86,7 +85,7 @@ urlpatterns = [ url(r'^', include('partners.api.urls')), url(r'wikilogin', views.wiki_login), ])), - url(r'^education/', include('education.urls', namespace='education')), + url(r'^education/', include('education.urls')), # Default login helpers url(r'^', include('django.contrib.auth.urls')), url(r'^i18n/', include('django.conf.urls.i18n')), -- GitLab