#7495 Add stageAssignments to submission.stages

pkp · Oct 3, 2024 · 42f0fb7 · 42f0fb7
1 parent 95b3535
commit 42f0fb7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/classes/submission/maps/Schema.php b/classes/submission/maps/Schema.php
@@ -525,6 +525,7 @@ public function getPropertyStages(Submission $submission): array
             ];
 
             $currentUserAssignedRoles = [];
+            $stageAssignmentsOverview = [];
             if ($currentUser) {
                 // Replaces StageAssignmentDAO::getBySubmissionAndUserIdAndStageId
                 $stageAssignments = StageAssignment::withSubmissionIds([$submission->getId()])
@@ -540,17 +541,21 @@ public function getPropertyStages(Submission $submission): array
 
                 // Replaces StageAssignmentDAO::getBySubmissionAndUserIdAndStageId
                 $stageAssignments = StageAssignment::withSubmissionIds([$submission->getId()])
-                    ->withUserId($currentUser->getId())
                     ->withStageIds([$stageId])
                     ->get();
 
                 foreach ($stageAssignments as $stageAssignment) {
                     $userGroup = Repo::userGroup()->get($stageAssignment->userGroupId);
-                    $currentUserAssignedRoles[] = (int) $userGroup->getRoleId();
+                    $stageAssignmentsOverview[] = [
+                        "roleId" => $userGroup->getRoleId(),
+                        "recommendOnly" => $stageAssignment->recommendOnly,
+                        "canChangeMetadata" => $stageAssignment->canChangeMetadata,
+                        "userId" => $stageAssignment->userId
+                    ];
                 }
             }
             $stage['currentUserAssignedRoles'] = array_values(array_unique($currentUserAssignedRoles));
-
+            $stage['stageAssignments'] = $stageAssignmentsOverview;
             // Stage-specific statuses
             switch ($stageId) {
                 case WORKFLOW_STAGE_ID_SUBMISSION:

diff --git a/locale/en/dashboard.po b/locale/en/dashboard.po
@@ -314,3 +314,5 @@ msgstr "An editorial recommendation has been received"
 msgid "dashboard.recommendOnly.recommendationsCompleted"
 msgstr "All editorial recommendations have been received, and a decision is required."
 
+msgid "dashboard.recommendOnly.onlyAllowedToRecommend"
+msgstr "Only allowed to recommend an editorial decision"
diff --git a/pages/dashboard/DashboardHandlerNext.php b/pages/dashboard/DashboardHandlerNext.php
@@ -250,7 +250,6 @@ class_exists(\APP\components\forms\publication\AssignToIssueForm::class); // For
 
             'DECISION_RECOMMEND_ACCEPT' => Decision::RECOMMEND_ACCEPT,
             'DECISION_RECOMMEND_DECLINE' => Decision::RECOMMEND_DECLINE,
-            'DECISION_RECOMMEND_ACCEPT' => Decision::RECOMMEND_ACCEPT,
             'DECISION_RECOMMEND_PENDING_REVISIONS' => Decision::RECOMMEND_PENDING_REVISIONS,
             'DECISION_RECOMMEND_RESUBMIT' => Decision::RECOMMEND_RESUBMIT,