summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorQuentinAndre <quentin.andre@imt-atlantique.net>2021-07-09 17:02:50 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-09-01 12:36:46 +0200
commit8a1e0e0f73b6ceec826b891e05e387efe709f968 (patch)
treed037d7d2d0e42ed05844cc156157f871e3670095 /archaeological_finds
parenta9d3f70df86814e1845d0357a8daca0cf997a689 (diff)
downloadIshtar-8a1e0e0f73b6ceec826b891e05e387efe709f968.tar.bz2
Ishtar-8a1e0e0f73b6ceec826b891e05e387efe709f968.zip
correction regex
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/tests.py12
-rw-r--r--archaeological_finds/urls.py6
-rw-r--r--archaeological_finds/views.py2
3 files changed, 10 insertions, 10 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 8c5feb7a2..cf1f47ba0 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -2526,14 +2526,12 @@ class GeomaticTest(FindInit, TestCase):
"type": "Feature",
"geometry": {"type": "Point", "coordinates": [2.0, 43.0]},
}
- res = base_find.get_geo_items(get_polygons=True)
- self.assertEqual(dic, res)
- res = base_find.get_geo_items(get_polygons=False)
+ res = base_find.get_geo_items()
self.assertEqual(dic, res)
# test API
find = base_find.find.all()[0]
- response = self.client.get(reverse("api-get-geo-items", kwargs={"pk": find.pk}))
+ response = self.client.get(reverse("api-get-geo-point", kwargs={"pk": find.pk}))
self.assertEqual(response.status_code, 200)
self.assertIn(json.dumps(dic).encode("utf-8"), response.content)
@@ -2575,14 +2573,16 @@ class GeomaticTest(FindInit, TestCase):
# test API
response = self.client.get(
reverse(
- "api-get-geo-items", kwargs={"pk": base_find.pk, "get_polygons": True}
+ "api-get-geo-polygons",
+ kwargs={"pk": base_find.pk, "get_polygons": True},
)
)
self.assertEqual(response.status_code, 200)
self.assertIn(json.dumps(dict_poly).encode("utf-8"), response.content)
response = self.client.get(
reverse(
- "api-get-geo-items", kwargs={"pk": base_find.pk, "get_polygons": False}
+ "api-get-geo-polygons",
+ kwargs={"pk": base_find.pk, "get_polygons": False},
)
)
self.assertEqual(response.status_code, 200)
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 699337b8f..8b23c8be0 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -573,18 +573,18 @@ urlpatterns = [
),
url(r"api/public/find/$", views.PublicFindAPI.as_view(), name="api-public-find"),
url(
- r"api/ishtar/base-finds/geo/polygons/(?P<pk>[0-9]+)/(?P<get_polygons>(True|False)/)?$",
+ r"api/ishtar/base-finds/geo/polygons/(?P<pk>[0-9]+)/(?P<get_polygons>(True|False)/?)?$",
check_rights(["view_find", "view_own_find"])(
views.get_geo_items,
),
- name="api-get-geo-items",
+ name="api-get-geo-polygons",
),
url(
r"api/ishtar/base-finds/geo/point/(?P<pk>[0-9]+)/$",
check_rights(["view_find", "view_own_find"])(
views.get_geo_items,
),
- name="api-get-geo-items",
+ name="api-get-geo-point",
),
]
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 8169f447b..ae0180d85 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -1318,7 +1318,7 @@ class PublicFindAPI(APIView):
return Response(serializer.data)
-def get_geo_items(request, pk, get_polygons, current_right=None):
+def get_geo_items(request, pk, get_polygons="False", current_right=None):
base_find = models.BaseFind.objects.get(pk=pk)
if not base_find:
return Http404()