pkp#6528 Allow Authors to delete incomplete submissions

taslangraham · Dec 13, 2024 · 0292e4e · 0292e4e
1 parent 3786512
commit 0292e4e
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/api/v1/_submissions/PKPBackendSubmissionsController.php b/api/v1/_submissions/PKPBackendSubmissionsController.php
@@ -93,6 +93,7 @@ public function getGroupRoutes(): void
             ->middleware([
                 self::roleAuthorizer([
                     Role::ROLE_ID_SITE_ADMIN,
+                    Role::ROLE_ID_AUTHOR,
                 ]),
             ]);
 
@@ -466,11 +467,20 @@ public function bulkDeleteIncompleteSubmissions(Request $illuminateRequest): Jso
             $submissionIds[] = $id;
         }
 
-        $submissions = $this->getSubmissionCollector($illuminateRequest->query())
+        $collector = $this->getSubmissionCollector($illuminateRequest->query())
             ->filterBySubmissionIds($submissionIds)
-            ->filterByIncomplete(true)
-            ->getMany()
-            ->all();
+            ->filterByIncomplete(true);
+
+        $request = Application::get()->getRequest();
+        $context = $this->getRequest()->getContext();
+        $user = $request->getUser();
+
+        if ($user->hasRole([Role::ROLE_ID_AUTHOR], $context->getId())) {
+            $userId = $request->getUser()->getId();
+            $collector->assignedTo([$userId]);
+        }
+
+        $submissions = $collector->getMany()->all();
 
         $submissionIdsFound = array_map(fn (Submission $submission) => $submission->getData('id'), $submissions);
 
@@ -480,7 +490,6 @@ public function bulkDeleteIncompleteSubmissions(Request $illuminateRequest): Jso
             ], Response::HTTP_NOT_FOUND);
         }
 
-        $context = $this->getRequest()->getContext();
 
         foreach ($submissions as $submission) {
             if ($context->getId() != $submission->getData('contextId')) {