OPEN-3192: Handle record ID's with slashes

open-data · Mar 5, 2024 · c4e6945 · c4e6945
1 parent 5d5f9cc
commit c4e6945
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/oc_search/urls.py b/oc_search/urls.py
@@ -36,7 +36,7 @@
         path('search/<str:lang>/', HomeView.as_view(), name="HomePage"),
         path('search/<str:lang>/<str:search_type>/', SearchView.as_view(), name="SearchForm"),
         path('rechercher/<str:lang>/<str:search_type>/', SearchView.as_view(), name="SearchForm"),
-        path('search/<str:lang>/<str:search_type>/record/<str:record_id>', RecordView.as_view(), name='RecordForm'),
+        path('search/<str:lang>/<str:search_type>/record/<path:record_id>', RecordView.as_view(), name='RecordForm'),
         path('search/<str:lang>/<str:search_type>/export/', ExportView.as_view(), name='ExportForm'),
         path('search/<str:lang>/<str:search_type>/download/<str:task_id>', DownloadSearchResultsView.as_view(), name='DownloadForm'),
         path('rechercher/<str:lang>/<str:search_type>/telecharger/<str:task_id>', DownloadSearchResultsView.as_view(), name='DownloadForm'),
@@ -59,9 +59,9 @@
         path('', DefaultView.as_view(), name="HomePage"),
         path(settings.SEARCH_HOST_PATH, HomeView.as_view(), name="HomePage"),
         path(settings.SEARCH_HOST_PATH + '<str:search_type>/', SearchView.as_view(), name="SearchForm"),
-        path(settings.SEARCH_HOST_PATH + 'record/<str:search_type>/<str:record_id>', RecordView.as_view(),
+        path(settings.SEARCH_HOST_PATH + 'record/<str:search_type>/<path:record_id>', RecordView.as_view(),
              name='RecordForm'),
-        path(settings.SEARCH_HOST_PATH + '<str:search_type>/record/<str:record_id>', RecordView.as_view(),
+        path(settings.SEARCH_HOST_PATH + '<str:search_type>/record/<path:record_id>', RecordView.as_view(),
              name='RecordForm'),
         path(settings.SEARCH_HOST_PATH + '<str:search_type>/export/', ExportView.as_view(), name='RecordForm'),
         path(settings.SEARCH_HOST_PATH + '<str:search_type>/download/<str:task_id>', DownloadSearchResultsView.as_view(), name='DownloadForm'),

diff --git a/search/templates/snippets/default_record_breadcrumb.html b/search/templates/snippets/default_record_breadcrumb.html
@@ -19,9 +19,6 @@
             },{
                 "title": "{% translate 'Open Government' %}",
                 "href": "{% translate 'https://open.canada.ca' %}/{{ LANGUAGE_CODE }}",
-            },{
-                "title": "{% translate 'Proactive Disclosure' %}",
-                "href": "{% translate 'https://open.canada.ca/en/proactive-disclosure' %}",
             },{
                 "title": "{{ search_title }}",
                 "href": "{{ parent_path }}",