search permissions for encounters

WildMeOrg · Dec 1, 2023 · 01d720e · 01d720e
1 parent 952d356
commit 01d720e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/modules/encounters/resources.py b/app/modules/encounters/resources.py
@@ -237,16 +237,29 @@ def post(self):
 
         from app.extensions.export.models import Export
 
+        ct = 0
         added = set()
         export = Export()
         for enc in encs:
+            if not enc.current_user_has_view_permission():
+                continue
             export.add(enc)
-            if enc.sighting_guid not in added:
+            ct += 1
+            if (
+                enc.sighting_guid not in added
+                and enc.sighting.current_user_has_view_permission()
+            ):
                 added.add(enc.sighting_guid)
                 export.add(enc.sighting)
-            if enc.individual_guid and enc.individual_guid not in added:
+            if (
+                enc.individual_guid
+                and enc.individual_guid not in added
+                and enc.individual.current_user_has_view_permission()
+            ):
                 added.add(enc.individual_guid)
                 export.add(enc.individual)
+        if not ct:
+            abort(400, 'No results to export')
         export.save()
         return send_file(
             export.filepath,

diff --git a/app/modules/encounters/schemas.py b/app/modules/encounters/schemas.py
@@ -88,6 +88,7 @@ class Meta:
             'verbatimLocality',
             'location_geo_point',
             'customFields',
+            'hasView',
         )
         dump_only = (Encounter.guid.key,)