Fix for validation cycle modification: relation between cycle and study is saved...

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index 0d133d13705e5d41a4728ec67d398b3b64c9a006..7fe60146e84a4838997fdafc15a7c4958e985586 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -357,7 +357,7 @@ public class StudyServiceImpl implements StudyService {
                                getValidationCycleDAO().create(cycle); // RKV
 
                                ValidationCycleRelation link = cycle.getContext();
-                               // RKV: aStudy.addRelation(link);
+                               aStudy.addRelation(link);
                                aStudyDTO.getAllRelations().add(link); // RKV
 
                                validactor.put(cname, link.getTo()); // Replaces the cycle if exists as default,
@@ -742,7 +742,7 @@ public class StudyServiceImpl implements StudyService {
                aValidationCycle.setApprover(vprop.getApprover()); // May be null
                aValidationCycle.setSignatory(vprop.getSignatory()); // May be null
                if (aValidationCycle.isSaved()) {
-                       getValidationCycleDAO().update(aValidationCycle);
+                       getValidationCycleDAO().merge(aValidationCycle);
                }
        }