django2.2: migrate url to re_path

This commit is contained in:
2019-10-05 18:14:41 +02:00
parent 7be9077fce
commit be855c6c90
19 changed files with 387 additions and 342 deletions

View File

@ -22,53 +22,53 @@
#
#
from django.conf.urls import url
from django.urls import re_path
from launderette.views import *
urlpatterns = [
# views
url(r"^$", LaunderetteMainView.as_view(), name="launderette_main"),
url(
re_path(r"^$", LaunderetteMainView.as_view(), name="launderette_main"),
re_path(
r"^slot/(?P<slot_id>[0-9]+)/delete$",
SlotDeleteView.as_view(),
name="delete_slot",
),
url(r"^book$", LaunderetteBookMainView.as_view(), name="book_main"),
url(
re_path(r"^book$", LaunderetteBookMainView.as_view(), name="book_main"),
re_path(
r"^book/(?P<launderette_id>[0-9]+)$",
LaunderetteBookView.as_view(),
name="book_slot",
),
url(
re_path(
r"^(?P<launderette_id>[0-9]+)/click$",
LaunderetteMainClickView.as_view(),
name="main_click",
),
url(
re_path(
r"^(?P<launderette_id>[0-9]+)/click/(?P<user_id>[0-9]+)$",
LaunderetteClickView.as_view(),
name="click",
),
url(r"^admin$", LaunderetteListView.as_view(), name="launderette_list"),
url(
re_path(r"^admin$", LaunderetteListView.as_view(), name="launderette_list"),
re_path(
r"^admin/(?P<launderette_id>[0-9]+)$",
LaunderetteAdminView.as_view(),
name="launderette_admin",
),
url(
re_path(
r"^admin/(?P<launderette_id>[0-9]+)/edit$",
LaunderetteEditView.as_view(),
name="launderette_edit",
),
url(r"^admin/new$", LaunderetteCreateView.as_view(), name="launderette_new"),
url(r"^admin/machine/new$", MachineCreateView.as_view(), name="machine_new"),
url(
re_path(r"^admin/new$", LaunderetteCreateView.as_view(), name="launderette_new"),
re_path(r"^admin/machine/new$", MachineCreateView.as_view(), name="machine_new"),
re_path(
r"^admin/machine/(?P<machine_id>[0-9]+)/edit$",
MachineEditView.as_view(),
name="machine_edit",
),
url(
re_path(
r"^admin/machine/(?P<machine_id>[0-9]+)/delete$",
MachineDeleteView.as_view(),
name="machine_delete",