Merge branch 'aiccra-staging' into AICCRA

CCAFS · Dec 18, 2024 · 005c0a2 · 005c0a2
2 parents 13337f2 + b16bd38
commit 005c0a2
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/DeliverableAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/DeliverableAction.java
@@ -3069,16 +3069,14 @@ private void saveDeliverableActivities(Deliverable deliverablePrew) {
 
       for (DeliverableActivity deliverableActivity : deliverable.getActivities()) {
         if (deliverableActivity.getId() != null && deliverableActivity.getId() != -1) {
-          deliverableActivity = deliverableActivityManager.getDeliverableActivityById(deliverableActivity.getId());
-        }
 
-        deliverableActivity.setDeliverable(deliverableManager.getDeliverableById(deliverableID));
-        deliverableActivity.setPhase(this.getActualPhase());
-        deliverableActivityManager.saveDeliverableActivity(deliverableActivity);
-        // This add projectFocus to generate correct auditlog.
-        deliverablePrew.getDeliverableActivities().add(deliverableActivity);
+          deliverableActivity.setDeliverable(deliverableManager.getDeliverableById(deliverableID));
+          deliverableActivity.setPhase(this.getActualPhase());
+          deliverableActivityManager.saveDeliverableActivity(deliverableActivity);
+          // This add projectFocus to generate correct auditlog.
+          deliverablePrew.getDeliverableActivities().add(deliverableActivity);
+        }
       }
-
     }
   }