From 66f561144c60a9ddc9b57b6645f72d16bfd5e1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 2 Jul 2018 08:36:29 +0200 Subject: [PATCH] misc: don't over match URLs (#24917) --- combo/apps/calendar/urls.py | 2 +- combo/apps/family/urls.py | 4 ++-- combo/apps/publik/urls.py | 2 +- combo/apps/pwa/urls.py | 4 ++-- combo/apps/wcs/urls.py | 2 +- combo/public/urls.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/combo/apps/calendar/urls.py b/combo/apps/calendar/urls.py index 499d6c1..a12d898 100644 --- a/combo/apps/calendar/urls.py +++ b/combo/apps/calendar/urls.py @@ -19,6 +19,6 @@ from django.conf.urls import url from .views import BookingView, CalendarContentAjaxView urlpatterns = [ - url(r'^calendar/book/(?P[\w,-]+)/', BookingView.as_view(), name='calendar-booking'), + url(r'^calendar/book/(?P[\w,-]+)/$', BookingView.as_view(), name='calendar-booking'), url(r'^ajax/calendar/content/(?P\w+)/$', CalendarContentAjaxView.as_view(), name='ajax-calendar-content'), ] diff --git a/combo/apps/family/urls.py b/combo/apps/family/urls.py index 19f50d2..e6d8997 100644 --- a/combo/apps/family/urls.py +++ b/combo/apps/family/urls.py @@ -19,6 +19,6 @@ from django.conf.urls import url from .views import FamilyLinkView, FamilyUnlinkView urlpatterns = [ - url(r'^family/link', FamilyLinkView.as_view(), name='family-link'), - url(r'^family/unlink', FamilyUnlinkView.as_view(), name='family-unlink') + url(r'^family/link/?$', FamilyLinkView.as_view(), name='family-link'), + url(r'^family/unlink/?$', FamilyUnlinkView.as_view(), name='family-unlink') ] diff --git a/combo/apps/publik/urls.py b/combo/apps/publik/urls.py index b25c393..7c7cc6a 100644 --- a/combo/apps/publik/urls.py +++ b/combo/apps/publik/urls.py @@ -18,4 +18,4 @@ from django.conf.urls import url from .views import services_js -urlpatterns = [url('^__services.js', services_js)] +urlpatterns = [url(r'^__services.js$', services_js)] diff --git a/combo/apps/pwa/urls.py b/combo/apps/pwa/urls.py index fb7ce24..6a17307 100644 --- a/combo/apps/pwa/urls.py +++ b/combo/apps/pwa/urls.py @@ -19,6 +19,6 @@ from django.conf.urls import url from .views import manifest_json, service_worker_js urlpatterns = [ - url('^manifest.json', manifest_json), - url('^service-worker.js', service_worker_js), + url('^manifest.json$', manifest_json), + url('^service-worker.js$', service_worker_js), ] diff --git a/combo/apps/wcs/urls.py b/combo/apps/wcs/urls.py index 7c78727..15e814f 100644 --- a/combo/apps/wcs/urls.py +++ b/combo/apps/wcs/urls.py @@ -19,5 +19,5 @@ from django.conf.urls import url from .views import TrackingCodeView urlpatterns = [ - url('^tracking-code/', TrackingCodeView.as_view(), name='wcs-tracking-code'), + url(r'^tracking-code/$', TrackingCodeView.as_view(), name='wcs-tracking-code'), ] diff --git a/combo/public/urls.py b/combo/public/urls.py index 23aecf0..abd6aae 100644 --- a/combo/public/urls.py +++ b/combo/public/urls.py @@ -20,8 +20,8 @@ from combo.urls_utils import manager_required from . import views urlpatterns = [ - url(r'^api/menu-badges/', views.menu_badges), - url(r'^api/search/', views.api_search, name='api-search'), + url(r'^api/menu-badges/$', views.menu_badges), + url(r'^api/search/$', views.api_search, name='api-search'), url(r'^ajax/cell/(?P\w+)/(?P[\w_-]+)/$', views.ajax_page_cell, name='combo-public-ajax-page-cell'), url(r'^snapshot/(?P\w+)/$', manager_required(views.snapshot), name='combo-snapshot-view'), -- 2.18.0