From b1e4bdb571a29b4b9861ab8730fdf3ce2484762a Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 13 Jan 2016 20:18:03 +0100 Subject: [PATCH] Simplified urls.py --- common/urls.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/common/urls.py b/common/urls.py index 3760f5b..fb031bb 100644 --- a/common/urls.py +++ b/common/urls.py @@ -1,17 +1,12 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from django.views.generic import RedirectView from stages import views -admin.autodiscover() - -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', RedirectView.as_view(url='/admin/'), name='home'), - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/', include(admin.site.urls)), url(r'^data-import/', include('tabimport.urls')), @@ -22,16 +17,16 @@ urlpatterns = patterns('', url(r'^institutions/(?P\d+)/$', views.CorporationView.as_view(), name='corporation'), # AJAX/JSON urls - url(r'^section/(?P\d+)/periods/', 'stages.views.section_periods'), - url(r'^section/(?P\d+)/classes/', 'stages.views.section_classes'), - url(r'^period/(?P\d+)/students/', 'stages.views.period_students'), - url(r'^period/(?P\d+)/corporations/', 'stages.views.period_availabilities'), + url(r'^section/(?P\d+)/periods/', views.section_periods), + url(r'^section/(?P\d+)/classes/', views.section_classes), + url(r'^period/(?P\d+)/students/', views.period_students), + url(r'^period/(?P\d+)/corporations/', views.period_availabilities), # Training params in POST: - url(r'^training/new/', 'stages.views.new_training', name="new_training"), - url(r'^training/del/', 'stages.views.del_training', name="del_training"), + url(r'^training/new/', views.new_training, name="new_training"), + url(r'^training/del/', views.del_training, name="del_training"), url(r'^training/by_period/(?P\d+)/', views.TrainingsByPeriodView.as_view()), url(r'^student/(?P\d+)/summary/', views.StudentSummaryView.as_view()), url(r'^availability/(?P\d+)/summary/', views.AvailabilitySummaryView.as_view()), url(r'^corporation/(?P\d+)/contacts/', views.CorpContactJSONView.as_view()), -) +]