Rename item slug to item_id

LibraryOfCongress · Mar 4, 2019 · 2f47107 · 2f47107
1 parent 2886057
commit 2f47107
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/concordia/converters.py b/concordia/converters.py
@@ -1,4 +1,4 @@
-from django.urls.converters import SlugConverter
+from django.urls.converters import SlugConverter, StringConverter
 
 
 class UnicodeSlugConverter(SlugConverter):
@@ -7,6 +7,6 @@ class UnicodeSlugConverter(SlugConverter):
     regex = r"[-\w+]+"
 
 
-class ItemSlugConverter(SlugConverter):
+class ItemIdConverter(StringConverter):
     # Allows . in the item ID
     regex = r"[-a-zA-Z0-9_\.]+"
diff --git a/concordia/urls.py b/concordia/urls.py
@@ -12,7 +12,7 @@
 from . import converters, views
 
 register_converter(converters.UnicodeSlugConverter, "uslug")
-register_converter(converters.ItemSlugConverter, "islug")
+register_converter(converters.ItemIdConverter, "item_id")
 
 tx_urlpatterns = (
     [
@@ -36,7 +36,10 @@
             name="project-export-bagit",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<islug:item_id>/export/bagit/",
+            (
+                "<uslug:campaign_slug>/<uslug:project_slug>/"
+                "<item_id:item_id>/export/bagit/"
+            ),
             exporter_views.ExportItemToBagIt.as_view(),
             name="item-export-bagit",
         ),
@@ -46,7 +49,10 @@
             name="campaign-report",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<islug:item_id>/<uslug:slug>/",
+            (
+                "<uslug:campaign_slug>/<uslug:project_slug>/"
+                "<item_id:item_id>/<uslug:slug>/"
+            ),
             views.AssetDetailView.as_view(),
             name="asset-detail",
         ),
@@ -67,7 +73,7 @@
             name="project-detail",
         ),
         path(
-            "<uslug:campaign_slug>/<uslug:project_slug>/<islug:item_id>/",
+            "<uslug:campaign_slug>/<uslug:project_slug>/<item_id:item_id>/",
             views.ItemDetailView.as_view(),
             name="item-detail",
         ),