Skip to content

Commit 42a7876

Browse files
authored
fixing resources catalog page routing (#2072)
1 parent f84bfeb commit 42a7876

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

geonode_mapstore_client/apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def run_setup_hooks(*args, **kwargs):
8686
),
8787
re_path(r"^metadata/(?P<pk>[^/]*)$", views.metadata, name='metadata'),
8888
re_path(r"^metadata/(?P<pk>[^/]*)/embed$", views.metadata_embed, name='metadata'),
89-
re_path(r"^(?P<page_id>[^/]*)$", views.resource_page_catalog, name='page_id'),
89+
re_path(r"^(?P<page_id>[^/]+)/?$", views.resource_page_catalog, name='page_id'),
9090
# required, otherwise will raise no-lookup errors to be analysed
9191
re_path(r"^api/v2/", include(router.urls)),
9292
]

geonode_mapstore_client/views.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
import json
33
from django.shortcuts import render
4+
from django.http import Http404
45
from django.utils.translation.trans_real import get_language_from_request
56
from dateutil import parser
67

@@ -76,5 +77,9 @@ def resource_page_catalog(request, page_id):
7677
from django.conf import settings
7778

7879
RESOURCES_PAGE_CONFIG = getattr(settings, "RESOURCES_PAGE_CONFIG", {})
79-
context = { "resource_page_config": json.dumps(RESOURCES_PAGE_CONFIG.get(page_id)) }
80+
config = RESOURCES_PAGE_CONFIG.get(page_id)
81+
if config is None:
82+
raise Http404(f"Resource page '{page_id}' does not exist.")
83+
84+
context = { "resource_page_config": json.dumps(config) }
8085
return render(request, "geonode-mapstore-client/resource_page_catalog.html", context=context)

0 commit comments

Comments
 (0)