From ed1abe16a35d5ea5cea1106f97c6dc08bfd5265c Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 15 Apr 2018 19:30:52 +0200
Subject: urls: utilisation de la nouvelle syntaxe path de Django
Mise à jour de la doc, nouvelles protections dans timetable_common()
---
urls.py | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
(limited to 'urls.py')
diff --git a/urls.py b/urls.py
index f24bbba..b61bbbe 100644
--- a/urls.py
+++ b/urls.py
@@ -13,23 +13,23 @@
# You should have received a copy of the GNU Affero General Public License
# along with celcatsanitizer. If not, see .
-from django.conf.urls import include, url
+from django.urls import include, path
from . import feeds, views
urlpatterns = [
- url(r"^$", views.index, name="index"),
- url(r"^pages/", include("django.contrib.flatpages.urls")),
- url(r"^salles/$", views.rooms, name="rooms"),
- url(r"^salles/qsjps$", views.qsjps, name="qsjps"),
- url(r"^salles/(?P[-\w]+)/$", views.room_timetable, name="room-timetable"),
- url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])$", views.room_timetable, name="room-timetable"),
- url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendars", views.calendars, name="calendars"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.rss$", feeds.RSSFeed(), name="rss"),
- url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])/$", views.timetable, name="timetable"),
+ path("", views.index, name="index"),
+ path("pages/", include("django.contrib.flatpages.urls")),
+ path("salles/", views.rooms, name="rooms"),
+ path("salles/qsjps", views.qsjps, name="qsjps"),
+ path("salles//", views.room_timetable, name="room-timetable"),
+ path("salles///", views.room_timetable, name="room-timetable"),
+ path("/", views.mention_list, name="mentions"),
+ path("//", views.group_list, name="groups"),
+ path("///", views.timetable, name="timetable"),
+ path("///calendars", views.calendars, name="calendars"),
+ path("///calendar.ics", feeds.IcalFeed(), name="ics"),
+ path("///calendar-group.ics", feeds.IcalOnlyOneFeed(), name="ics-group"),
+ path("///feed.atom", feeds.AtomFeed(), name="atom"),
+ path("///feed.rss", feeds.RSSFeed(), name="rss"),
+ path("/////", views.timetable, name="timetable"),
]
--
cgit v1.2.1