From ed6612682e079dceebeaf267328f79c41e97630e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarda=20Kot=C4=9B=C5=A1ovec?= Date: Thu, 14 Nov 2024 14:32:30 +0100 Subject: [PATCH] pkp/pkp-lib#10599 Refining which editorial decisions are displayed and when. --- classes/submission/maps/Schema.php | 12 ++++++++---- registry/uiLocaleKeysBackend.json | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/classes/submission/maps/Schema.php b/classes/submission/maps/Schema.php index eefab8e4496..cef488de12e 100644 --- a/classes/submission/maps/Schema.php +++ b/classes/submission/maps/Schema.php @@ -166,11 +166,13 @@ protected function getAvailableEditorialDecisions(int $stageId, Submission $subm ]; if ($submission->getData('status') === Submission::STATUS_DECLINED) { - $decisionTypes[] = new RevertInitialDecline(); + // when the submission is declined, allow only reverting declined status + $decisionTypes = [new RevertInitialDecline()]; } elseif ($submission->getData('status') === Submission::STATUS_QUEUED) { $decisionTypes[] = new InitialDecline(); + $decisionTypes[] = new SendInternalReview(); + } - $decisionTypes[] = new SendInternalReview(); break; case WORKFLOW_STAGE_ID_INTERNAL_REVIEW: $decisionTypes = [ @@ -185,7 +187,8 @@ protected function getAvailableEditorialDecisions(int $stageId, Submission $subm } if ($submission->getData('status') === Submission::STATUS_DECLINED) { - $decisionTypes[] = new RevertDeclineInternal(); + // when the submission is declined, allow only reverting declined status + $decisionTypes = [new RevertDeclineInternal()]; } elseif ($submission->getData('status') === Submission::STATUS_QUEUED) { $decisionTypes[] = new DeclineInternal(); } @@ -201,7 +204,8 @@ protected function getAvailableEditorialDecisions(int $stageId, Submission $subm $decisionTypes[] = $cancelReviewRound; } if ($submission->getData('status') === Submission::STATUS_DECLINED) { - $decisionTypes[] = new RevertDecline(); + // when the submission is declined, allow only reverting declined status + $decisionTypes = [new RevertDecline()]; } elseif ($submission->getData('status') === Submission::STATUS_QUEUED) { $decisionTypes[] = new Decline(); } diff --git a/registry/uiLocaleKeysBackend.json b/registry/uiLocaleKeysBackend.json index 295049a5212..ae31bb46e56 100644 --- a/registry/uiLocaleKeysBackend.json +++ b/registry/uiLocaleKeysBackend.json @@ -1,4 +1,5 @@ [ + "about.contact.email", "admin.jobs.failed.action.redispatch", "admin.jobs.failed.action.redispatch.all", "admin.version", @@ -201,6 +202,7 @@ "editor.submission.decision.cancelReviewRound", "editor.submission.decision.decline", "editor.submission.decision.requestRevisions", + "editor.submission.decision.revertDecline", "editor.submission.decision.sendExternalReview", "editor.submission.decision.sendInternalReview", "editor.submission.decision.sendToProduction", @@ -258,6 +260,13 @@ "grid.user.confirmLogInAs", "help.help", "informationCenter.informationCenter", + "invitation.cancelInvite.actionName", + "invitation.cancelInvite.message", + "invitation.cancelInvite.title", + "invitation.header", + "invitation.inviteToRole.btn", + "invitation.management.options", + "invitation.tableHeader.name", "issue.issue", "list.collapseAll", "list.expandAll", @@ -323,6 +332,10 @@ "manager.mailables.editTemplate", "manager.mailables.templates", "manager.publication.reviewStage", + "manager.statistics.counterR5Report.settings", + "manager.statistics.counterR5Reports", + "manager.statistics.counterR5Reports.description", + "manager.statistics.counterR5Reports.usageNotPossible", "manager.workflow", "monograph.audience", "navigation.backTo", @@ -468,8 +481,14 @@ "submissions.declined", "submissions.incomplete", "todo", + "user.affiliation", "user.authorization.accessibleWorkflowStage", + "user.email", "user.gossip", + "userInvitation.edit.message", + "userInvitation.edit.title", + "userInvitation.roleTable.role", + "userInvitation.status.invited", "validator.required", "workflow.review.externalReview", "workflow.review.internalReview"