Merge branch 'aiccra-staging' into aiccra-dev

CCAFS · Apr 11, 2024 · 0ead888 · 0ead888
2 parents 3615393 + 5c72d17
commit 0ead888
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...b/src/main/java/org/cgiar/ccafs/marlo/action/json/project/SaveFeedbackCommentsAction.java b/...b/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);