From c3f2991b9cd24cc24a7c8f1f7e7536d950facb0e Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Fri, 9 Sep 2022 14:54:48 +0200 Subject: [PATCH] Update location urls configuration --- config/urls.py | 4 +--- ultron/location/tests_urls.py | 17 ++++++++--------- ultron/location/urls.py | 22 +++++++++------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/config/urls.py b/config/urls.py index 5e57c0d298..27b5b96cc9 100644 --- a/config/urls.py +++ b/config/urls.py @@ -31,9 +31,7 @@ urlpatterns = [ path(r"gymnast/", include(ultron.people.urls.gymnast_urlpatterns)), # Location management - path(r"place/", include(ultron.location.urls.place_urlpatterns)), - path(r"country/", include(ultron.location.urls.country_urlpatterns)), - path(r"club/", include(ultron.location.urls.club_urlpatterns)), + path(r"location/", include(ultron.location.urls.urlpatterns)), # Follow-up management path(r"chrono/", include(ultron.followup.urls.chrono_urlpatterns)), diff --git a/ultron/location/tests_urls.py b/ultron/location/tests_urls.py index 42f8e3d196..32a7d325ec 100644 --- a/ultron/location/tests_urls.py +++ b/ultron/location/tests_urls.py @@ -1,20 +1,19 @@ from django.test import TestCase from django.urls import reverse, resolve -# from ultron.profiles.views import profile_update class URLTestCase(TestCase): def test_place_url(self): - self.assertEqual(resolve("/place/lookup/").view_name, 'place_lookup') - self.assertEqual(resolve("/place/add/").view_name, 'place_create') - self.assertEqual(resolve("/place/edit/1/").view_name, 'place_update') - self.assertEqual(resolve("/place/1/").view_name, 'place_details') - self.assertEqual(resolve("/place/").view_name, 'place_list') + self.assertEqual(resolve("/location/place/lookup/").view_name, 'place_lookup') + self.assertEqual(resolve("/location/place/add/").view_name, 'place_create') + self.assertEqual(resolve("/location/place/edit/1/").view_name, 'place_update') + self.assertEqual(resolve("/location/place/1/").view_name, 'place_details') + self.assertEqual(resolve("/location/place/").view_name, 'place_list') def test_country_url(self): - self.assertEqual(resolve("/country/lookup/").view_name, 'country_lookup') + self.assertEqual(resolve("/location/country/lookup/").view_name, 'country_lookup') def test_club_url(self): - self.assertEqual(resolve("/club/lookup/").view_name, 'club_lookup') - self.assertEqual(resolve("/club/").view_name, 'club_list') + self.assertEqual(resolve("/location/club/lookup/").view_name, 'club_lookup') + self.assertEqual(resolve("/location/club/").view_name, 'club_list') diff --git a/ultron/location/urls.py b/ultron/location/urls.py index d27910c84e..f38d832167 100644 --- a/ultron/location/urls.py +++ b/ultron/location/urls.py @@ -3,19 +3,15 @@ from django.urls import path from . import views -place_urlpatterns = [ - path(r"lookup/", views.place_lookup, name="place_lookup"), - path(r"add/", views.place_create_or_update, name="place_create"), - path(r"edit//", views.place_create_or_update, name="place_update"), - path(r"/", views.place_details, name="place_details"), - path(r"", views.place_listing, name="place_list"), -] +urlpatterns = [ + path(r"place/lookup/", views.place_lookup, name="place_lookup"), + path(r"place/add/", views.place_create_or_update, name="place_create"), + path(r"place/edit//", views.place_create_or_update, name="place_update"), + path(r"place//", views.place_details, name="place_details"), + path(r"place/", views.place_listing, name="place_list"), -country_urlpatterns = [ - path(r"lookup/", views.country_lookup, name="country_lookup"), -] + path(r"country/lookup/", views.country_lookup, name="country_lookup"), -club_urlpatterns = [ - path(r"", views.club_listing, name="club_list"), - path(r"lookup/", views.club_lookup, name="club_lookup"), + path(r"club/", views.club_listing, name="club_list"), + path(r"club/lookup/", views.club_lookup, name="club_lookup"), ]