From: rkv <rkv@opencascade.com>
Date: Wed, 5 Dec 2012 18:13:40 +0000 (+0000)
Subject: Fix for validation cycle modification: relation between cycle and study is saved... 
X-Git-Tag: Root_Delivery1_2012_12_06~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a2a95ffa482d0753aa4d77719f11cb636b7dfe4;p=tools%2Fsiman.git

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

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index 0d133d1..7fe6014 100644
--- 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);
 		}
 	}