Url for public find api

3 files changed, 12 insertions, 6 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 8a942e306..0658496d6 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -342,8 +342,10 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms,
             "comment": self.comment,
             "discovery-date": self.discovery_date and
                               self.discovery_date.strftime("%Y/%m/%d"),
-            "discovery-date-taq": self.discovery_date_taq,
-            "discovery-date-tpq": self.discovery_date_tpq,
+            "discovery-date-taq": self.discovery_date and
+                                  self.discovery_date_taq.strftime("%Y/%m/%d"),
+            "discovery-date-tpq": self.discovery_date and
+                                  self.discovery_date.strftime("%Y/%m/%d"),
         })
         return dct
 
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 0f86a363e..8e01a2931 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -302,6 +302,9 @@ urlpatterns = [
         check_rights(['change_find', 'change_own_find'])(
             views.autocomplete_findbasket),
         name='autocomplete-findbasket'),
+
+    url(r'api/public/find/$', views.PublicFindAPI.as_view(),
+        name='api-public-find'),
 ]
 
 urlpatterns += get_urls_for_model(models.Find, views, own=True,
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 694a1e0ad..d5d5d88b6 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -1012,14 +1012,15 @@ class PublicFindAPI(APIView):
     # permission_classes = (permissions.IsAdminUser,)
 
     def get_queryset(self):
-        basket_slug = self.kwargs.get("basket", None)
+        empty = models.Find.objects.filter(pk=None)
+        basket_slug = self.request.GET.get("basket", None)
         if not basket_slug:
-            return models.Find.objects.filter(pk=None)
+            return empty
         try:
             basket = models.FindBasket.objects.get(
-                slug=basket, public=True)
+                slug=basket_slug, public=True)
         except models.FindBasket.DoesNotExist:
-            return Http404()
+            return empty
         return models.Find.objects.filter(basket=basket).order_by("pk")
 
     def get(self, request, format=None):