pkp#8948 Fixed activity log on review cancel

touhidurabir · May 2, 2023 · 9372906 · 9372906
1 parent 2e69b0b
commit 9372906
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/classes/decision/types/BackFromCopyediting.php b/classes/decision/types/BackFromCopyediting.php
@@ -102,7 +102,7 @@ public function getDescription(?string $locale = null): string
 
     public function getLog(): string
     {
-        return __('editor.submission.decision.backFromCopyediting.log');
+        return 'editor.submission.decision.backFromCopyediting.log';
     }
 
     public function getCompletedLabel(): string

diff --git a/classes/decision/types/CancelReviewRound.php b/classes/decision/types/CancelReviewRound.php
@@ -97,7 +97,7 @@ public function getDescription(?string $locale = null): string
 
     public function getLog(): string
     {
-        return __('editor.submission.decision.cancelReviewRound.log');
+        return 'editor.submission.decision.cancelReviewRound.log';
     }
 
     public function getCompletedLabel(): string

diff --git a/classes/submissionFile/Repository.php b/classes/submissionFile/Repository.php
@@ -701,7 +701,7 @@ public function getWorkflowStageId(SubmissionFile $submissionFile): ?int
             $reviewRoundDao = DAORegistry::getDAO('ReviewRoundDAO'); /** @var ReviewRoundDAO $reviewRoundDao */
             $reviewRound = $reviewRoundDao->getBySubmissionFileId($submissionFile->getId());
 
-            return $reviewRound->getStageId();
+            return $reviewRound?->getStageId();
         }
 
         if ($fileStage === SubmissionFile::SUBMISSION_FILE_QUERY) {