From 5c72d173a06c6c61983627c332faa03eedd9f6d9 Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Tue, 9 Apr 2024 10:32:24 -0500 Subject: [PATCH] :bug: fix(feedback): Update draft action user and date in feedback process --- .../action/json/project/SaveFeedbackCommentsAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/json/project/SaveFeedbackCommentsAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/json/project/SaveFeedbackCommentsAction.java index 58628ecfb1..c630a3b935 100644 --- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/json/project/SaveFeedbackCommentsAction.java +++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/json/project/SaveFeedbackCommentsAction.java @@ -484,11 +484,11 @@ public void setFeedbackStatus() { feedbackStatus = feedbackStatusManager.getFeedbackStatusById(Long.parseLong(FeedbackStatusEnum.Draft.getStatusId())); } else { - // Set comment as Agreed + // Set comment as Admitted feedbackStatus = feedbackStatusManager.getFeedbackStatusById(Long.parseLong(FeedbackStatusEnum.Admitted.getStatusId())); - qaComment.setUserApproval(this.getCurrentUser()); - qaComment.setApprovalDate(date); + qaComment.setDraftActionUser(this.getCurrentUser()); + qaComment.setDraftActionDate(date); } qaComment.setFeedbackStatus(feedbackStatus);