From a2e78d8dcc2135fad4fcc39aac60ea824ed9e304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 4 Jan 2018 23:33:31 +0100 Subject: [PATCH] Django2 urls --- Ernestophone/urls.py | 47 ++++++++++++++++++++----------------------- calendrier/urls.py | 32 ++++++++++++++--------------- calendrier/views.py | 2 +- pads/urls.py | 11 +++++----- pads/views.py | 2 +- partitions/urls.py | 33 ++++++++++++------------------ propositions/urls.py | 14 ++++++------- propositions/views.py | 2 +- 8 files changed, 67 insertions(+), 76 deletions(-) diff --git a/Ernestophone/urls.py b/Ernestophone/urls.py index 8313307..a4c3413 100644 --- a/Ernestophone/urls.py +++ b/Ernestophone/urls.py @@ -1,36 +1,33 @@ -from django.conf.urls import include, url from django.contrib import admin from django.contrib.auth import views as auth_views from django.conf.urls.static import static from django.conf import settings +from django.urls import include, path from gestion import views as gestion_views + urlpatterns = [ - url(r'^$', gestion_views.home, name='home'), - url(r'^login/?$', gestion_views.login, name='login'), - url(r'^logout/?$', auth_views.logout, {'next_page': '/'}, name='logout'), - url(r'^registration/?$', gestion_views.inscription_membre, - name='registration'), - url(r'^change/?', gestion_views.change_membre, name='change_membre'), - url(r'^password/?', gestion_views.change_password, name='change_password'), - url(r'^user/password/reset/$', auth_views.password_reset, - {'post_reset_redirect': '/user/password/reset/done/'}, - name="password_reset"), - url(r'^user/password/reset/done/$', - auth_views.password_reset_done), - url(r'^user/password/reset/(?P[0-9A-Za-z]+)-(?P.+)/$', - auth_views.password_reset_confirm, - {'post_reset_redirect': '/user/password/done/'}, - name="password_reset_confirm"), - url(r'^user/password/done/$', - auth_views.password_reset_complete), - url(r'^admin/', include(admin.site.urls)), - url(r'^partitions/', include('partitions.urls')), - url(r'^pads/', include('pads.urls')), - url(r'^calendar/', include('calendrier.urls')), - url(r'^propositions/', include('propositions.urls')), - url(r'^divers/', gestion_views.divers), + path("", gestion_views.home, name="home"), + path("login", gestion_views.login, name="login"), + path("logout", auth_views.logout, {"next_page": "/"}, name="logout"), + path("registration", gestion_views.inscription_membre, name="registration"), + path("change", gestion_views.change_membre, name="change_membre"), + path("password", gestion_views.change_password, name="change_password"), + path("user/password/reset", auth_views.password_reset, + {"post_reset_redirect": "/user/password/reset/done/"}, + name="password_reset"), + path("user/password/reset/done", auth_views.password_reset_done), + path("user/password/reset///", auth_views.password_reset_confirm, + {'post_reset_redirect': '/user/password/done/'}, + name="password_reset_confirm"), + path("user/password/done", auth_views.password_reset_complete), + path("admin/", admin.site.urls), + path("partitions/", include('partitions.urls')), + path("pads/", include('pads.urls')), + path("calendar/", include('calendrier.urls')), + path("propositions/", include('propositions.urls')), + path("divers/", gestion_views.divers), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/calendrier/urls.py b/calendrier/urls.py index b37e1fb..a63137b 100644 --- a/calendrier/urls.py +++ b/calendrier/urls.py @@ -1,20 +1,20 @@ -from django.conf.urls import url +from django.urls import path -from calendrier import views -from calendrier.views import EventUpdate, EventDelete +from . import views +from .views import EventUpdate, EventDelete + +app_name = "calendrier" urlpatterns = [ - url(r'^new$', views.create_event, name='calendrier-create_event'), - url(r'^$', views.home), - url(r'^edition/(?P\d+)$', EventUpdate.as_view()), - url(r'^supprimer/(?P\d+)$', EventDelete.as_view()), - url(r'^resend/(?P\d+)$', views.resend, name='calendrier-resend'), - url(r'^changename/?$', views.changename, name='change-doodle-name'), - url(r'(?P\d+)/reponse/?', views.reponse, name='calendrier-reponse'), - url(r'(?P\w{6})/(?P\w{6})/(?P\w+)/?', - views.reponse_event, - name='calendrier.reponse_event'), - url(r'(?P\d+)/(?P\d+)/(?P\d+)/?', views.view_event), - url(r'(?P\d+)/(?P\d+)/?$', views.calendar), - url(r'(?P\d+)/?', views.view_eventbis, name='view-event'), + path("", views.home), + path("new", views.create_event, name="create_event"), + path("edition/", EventUpdate.as_view()), + path("supprimer/", EventDelete.as_view()), + path("resend/", views.resend, name="resend"), + path("changename", views.changename, name="change-doodle-name"), + path("/reponse", views.reponse, name="reponse"), + path("rep///", views.reponse_event, name="reponse_event"), + path("//", views.view_event), + path("/", views.calendar), + path("", views.view_eventbis, name="view-event"), ] diff --git a/calendrier/views.py b/calendrier/views.py index a5da1ae..fa5360c 100644 --- a/calendrier/views.py +++ b/calendrier/views.py @@ -4,7 +4,7 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.sites.shortcuts import get_current_site from django.utils.safestring import mark_safe from django.views.generic import UpdateView, DeleteView -from django.core.urlresolvers import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy from django.contrib.auth.decorators import login_required from django.utils.decorators import method_decorator from django.core.mail import send_mail diff --git a/pads/urls.py b/pads/urls.py index f7cb987..79908d0 100644 --- a/pads/urls.py +++ b/pads/urls.py @@ -1,12 +1,13 @@ -from django.conf.urls import url +from django.urls import path from pads import views from pads.views import PadUpdate, PadDelete +app_name = "pads" urlpatterns = [ - url(r'^$', views.liste_pads, name='pads-liste'), - url(r'^ajouter$', views.add_pad, name='pads-add'), - url(r'^edition/(?P\d+)$', PadUpdate.as_view()), - url(r'^supprimer/(?P\d+)$', PadDelete.as_view()), + path("", views.liste_pads, name="list"), + path("ajouter", views.add_pad, name="add"), + path("edition/", PadUpdate.as_view()), + path("supprimer/", PadDelete.as_view()), ] diff --git a/pads/views.py b/pads/views.py index d0f0344..1d3f80c 100644 --- a/pads/views.py +++ b/pads/views.py @@ -1,6 +1,6 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import render -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.views.generic import UpdateView, DeleteView from django.utils.decorators import method_decorator from datetime import date diff --git a/partitions/urls.py b/partitions/urls.py index 90d7b06..8424e68 100644 --- a/partitions/urls.py +++ b/partitions/urls.py @@ -1,24 +1,17 @@ -from django.conf.urls import url +from django.urls import path -from partitions import views +from . import views +app_name = "partitions" urlpatterns = [ - url(r'^$', views.liste, name='partitions-liste'), - url(r'^(?P[^/]+)/(?P[^/]+)/?$', views.listepart, - name='partitions-listepart'), - url(r'^(?P[^/]+)/(?P[^/]+)/upload/?$', views.upload, - name='partitions-upload'), - url(r'^(?P[^/]+)/(?P[^/]+)/delete/?$', views.delete_morc, - name='partitions-delete_morc'), - url(r'^(?P[^/]+)/(?P[^/]+)/conf/?$', views.conf_delete_morc, - name='partitions-conf_delete_morc'), - url(r'^(?P[^/]+)/(?P[^/]+)/see/(?P\d+)/?$', - views.see, name='partitions-see'), - url(r'^(?P[^/]+)/(?P[^/]+)/(?P\d+)/$', - views.download, name='partitions-download'), - url(r'^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/delete/?$', - views.delete, name='partitions-delete'), - url(r'^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/conf/?$', - views.conf_delete, name='partitions-conf_delete'), - url(r'^new/?$', views.ajouter_morceau, name='partitions-ajouter_morceau'), + path("", views.liste, name="liste"), + path("/", views.listepart, name="listepart"), + path("//upload", views.upload, name="upload"), + path("//delete", views.delete_morc, name="delete_morc"), + path("//conf", views.conf_delete_morc, name="conf_delete_morc"), + path("//see/", views.see, name="see"), + path("//", views.download, name="download"), + path("///delete", views.delete, name="delete"), + path("///conf", views.conf_delete, name="conf_delete"), + path("new", views.ajouter_morceau, name="ajouter_morceau'"), ] diff --git a/propositions/urls.py b/propositions/urls.py index fb537b0..2525ac2 100644 --- a/propositions/urls.py +++ b/propositions/urls.py @@ -1,13 +1,13 @@ -from django.conf.urls import url +from django.urls import path from propositions.views import PropDelete from propositions import views +app_name = "propositions" urlpatterns = [ - url(r'^$', views.liste, name='propositions-liste'), - url(r'^new/?$', views.create_prop, name='propositions-create'), - url(r'^(?P\d+)/oui/?$', views.repoui, name='propositions-oui'), - url(r'^(?P\d+)/non/?$', views.repnon, name='propositions-non'), - url(r'^(?P\d+)/supprimer/?$', PropDelete.as_view(), - name='propositions-delete'), + path("", views.liste, name="liste"), + path("new", views.create_prop, name="create"), + path("/oui", views.repoui, name="oui"), + path("/non", views.repnon, name="non"), + path("/supprimer", PropDelete.as_view(), name="delete"), ] diff --git a/propositions/views.py b/propositions/views.py index 8e45452..7ff813d 100644 --- a/propositions/views.py +++ b/propositions/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render, redirect, get_object_or_404 -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.contrib.auth.decorators import login_required from django.views.generic import DeleteView from django.utils.decorators import method_decorator