pkp#10874 Omit WORKFLOW_STAGE_ID_SUBMISSION stage for OPS

Vitaliy-1 · Feb 11, 2025 · ecf81ba · ecf81ba
1 parent 3b1c010
commit ecf81ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/controllers/grid/settings/sections/form/PKPSectionForm.php b/controllers/grid/settings/sections/form/PKPSectionForm.php
@@ -112,10 +112,14 @@ public function setSection(Section $section): void
      */
     public function fetch($request, $template = null, $display = false)
     {
+        $stages = Application::getApplicationStages();
         $assignableUserGroups = UserGroup::query()
             ->withContextIds([$request->getContext()->getId()])
             ->withRoleIds($this->assignableRoles)
-            ->withStageIds([WORKFLOW_STAGE_ID_SUBMISSION])
+            ->withStageIds([
+                // WORKFLOW_STAGE_ID_SUBMISSION for OJS/OMP and WORKFLOW_STAGE_ID_PRODUCTION for OPS, see pkp/pkp-lib#10874
+                array_shift($stages)
+            ])
             ->get()
             ->map(function (UserGroup $userGroup) use ($request) {
                 return [

diff --git a/pages/submission/PKPSubmissionHandler.php b/pages/submission/PKPSubmissionHandler.php
@@ -854,11 +854,15 @@ protected function showErrorPage(string $titleLocaleKey, string $message): void
     protected function getWorkflowUrl(Submission $submission, User $user): string
     {
         $request = Application::get()->getRequest();
+        $stages = Application::getApplicationStages();
 
         // Replaces StageAssignmentDAO::getBySubmissionAndRoleIds
         $hasStageAssignments = StageAssignment::withSubmissionIds([$submission->getId()])
             ->withRoleIds([Role::ROLE_ID_AUTHOR])
-            ->withStageIds([WORKFLOW_STAGE_ID_SUBMISSION])
+            ->withStageIds([
+                // WORKFLOW_STAGE_ID_SUBMISSION for OJS/OMP and WORKFLOW_STAGE_ID_PRODUCTION for OPS, see pkp/pkp-lib#10874
+                array_shift($stages)
+            ])
             ->withUserId($user->getId())
             ->exists();