allow admins/curators to publish draft works; fix polygon editing

Author: nuest

works/templates/work_landing_page.html

@@ -632,7 +632,16 @@ <h5 class="mb-0">
       drawnItems = featureGroup;
 
       if (publicationFeature) {
-        L.geoJSON(publicationFeature).eachLayer(function(l) {
+        // GeometryCollection must be split into individual features; L.geoJSON
+        // wraps the whole collection in a nested FeatureGroup that Leaflet.Draw
+        // cannot edit directly.
+        const geom = publicationFeature.geometry;
+        const editFeatures = (geom && geom.type === 'GeometryCollection')
+          ? geom.geometries.map(function(g) {
+              return { type: 'Feature', geometry: g, properties: publicationFeature.properties };
+            })
+          : [publicationFeature];
+        L.geoJSON({ type: 'FeatureCollection', features: editFeatures }).eachLayer(function(l) {
           drawnItems.addLayer(l);
         });
       }

works/views/work_views.py

@@ -452,8 +452,13 @@ def work_landing(request, identifier):
         not request.user.is_authenticated
         and work.status in ('h', 'c')
     )
-    can_publish = is_admin and (
-        work.status == 'c'
+    is_curator = (
+        request.user.is_authenticated
+        and not is_admin
+        and work.collections.filter(curators=request.user).exists()
+    )
+    can_publish = (is_admin or is_curator) and (
+        work.status in ('c', 'd')
         or (work.status == 'h' and (cacheable["has_geometry"] or cacheable["has_temporal"]))
     )
     can_unpublish = is_admin and work.status == 'p'

works/views_geometry.py

@@ -157,41 +157,46 @@ def contribute_geometry_by_id(request, work_id):
         return JsonResponse({'error': str(e)}, status=500)
 
 
-@staff_member_required
 @require_POST
 def publish_work_by_id(request, work_id):
     """
-    API endpoint for admins to publish a work by ID.
-    Used for publications without a DOI.
-    Changes status from 'Contributed' or 'Harvested' to 'Published'.
-    For harvested publications, requires that at least one extent (spatial or temporal) exists.
+    API endpoint for admins and collection curators to publish a work by ID.
+    Changes status from Contributed, Harvested, or Draft to Published.
+    Harvested works require at least one spatial or temporal extent.
     """
+    if not request.user.is_authenticated:
+        return JsonResponse({'error': 'Authentication required'}, status=401)
+
     try:
         work = Work.objects.get(id=work_id)
     except Work.DoesNotExist:
         return JsonResponse({'error': 'Work not found'}, status=404)
 
+    is_staff = request.user.is_staff
+    is_curator = not is_staff and work.collections.filter(curators=request.user).exists()
+    if not (is_staff or is_curator):
+        return JsonResponse({'error': 'Permission denied'}, status=403)
+
     # Check if work has any extent information
     has_geometry = work.geometry and not work.geometry.empty
     has_temporal = (
         any(d is not None for d in (work.timeperiod_startdate or [])) or
         any(d is not None for d in (work.timeperiod_enddate or []))
     )
 
-    # Allow publishing of contributed publications or harvested publications with at least one extent
     if work.status == 'c':
-        # Contributed - can always publish
         old_status = 'Contributed'
+    elif work.status == 'd':
+        old_status = 'Draft'
     elif work.status == 'h':
-        # Harvested - only if it has at least one extent type
         if not (has_geometry or has_temporal):
             return JsonResponse({
                 'error': 'Cannot publish harvested work without spatial or temporal extent'
             }, status=400)
         old_status = 'Harvested'
     else:
         return JsonResponse({
-            'error': 'Can only publish contributed or harvested publications'
+            'error': 'Can only publish contributed, draft, or harvested publications'
         }, status=400)
 
     try: