almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-05-04 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check both matching pk and slug for map urls

Browse source 
Fix #905
This commit is contained in:
David Larlet 2023-05-05 23:16:19 -04:00
parent 65ca484d71
commit 8ccc45b0e6
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
umap/tests/test_map_views.py
View file

@ -122,20 +122,8 @@ def test_delete(client, map, datalayer):
def test_wrong_slug_should_redirect_to_canonical(client, map):
url = reverse("map", kwargs={"pk": map.pk, "slug": "wrong-slug"})
canonical = reverse("map", kwargs={"pk": map.pk, "slug": map.slug})
response = client.get(url)
assert response.status_code == 301
assert response["Location"] == canonical
def test_wrong_slug_should_redirect_with_query_string(client, map):
url = reverse("map", kwargs={"pk": map.pk, "slug": "wrong-slug"})
url = "{}?allowEdit=0".format(url)
canonical = reverse("map", kwargs={"pk": map.pk, "slug": map.slug})
canonical = "{}?allowEdit=0".format(canonical)
response = client.get(url)
assert response.status_code == 301
assert response["Location"] == canonical
assert response.status_code == 404
def test_should_not_consider_the_query_string_for_canonical_check(client, map):

2
umap/views.py
View file

@ -451,6 +451,8 @@ class PermissionsMixin:
class MapView(MapDetailMixin, PermissionsMixin, DetailView):
query_pk_and_slug = True
def get(self, request, *args, **kwargs):
self.object = self.get_object()
canonical = self.get_canonical_url()