From 2b48e982228b56ed4a5530f5eef62cb505d0f7b9 Mon Sep 17 00:00:00 2001 From: liuhong Date: Fri, 13 Jan 2023 06:47:07 +0000 Subject: [PATCH] * Fix bug #27671. --- module/story/model.php | 2 +- module/story/view/review.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index cf705af348..93807e3eba 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -6039,7 +6039,7 @@ class storyModel extends model if($result == 'reject') { $now = helper::now(); - $reason = (empty($reason) and isset($story->closedReason)) ? $story->closedReason : $reason; + $reason = (!empty($story->closedReason)) ? $story->closedReason : $reason; $story->status = 'closed'; $story->closedBy = $this->app->user->account; diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index fba8b02852..2433c10253 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -35,7 +35,7 @@ story->assignedTo;?> assignedTo, "class='form-control picker-select'");?> - + story->rejectedReason;?> story->reasonList, '', 'class=form-control onchange="setStory(this.value)"');?>