From: mka <mka@opencascade.com>
Date: Thu, 4 Apr 2013 13:36:26 +0000 (+0000)
Subject: Make private/public operation the study remain the knowledge state.
X-Git-Tag: Root_Delivery2_2013_04_22~54
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8bc6d67fc57347bf59e5f158e6c8b3e0a3a0cf74;p=tools%2Fsiman.git

Make private/public operation the study remain the knowledge state.
---

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index 29a27d4..4660ca7 100644
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -761,25 +761,20 @@ public class StudyServiceImpl implements StudyService {
 	 * @return true if reindexing succeeded
 	 */
 	private boolean updateKnowledgeElementsIndex(final Study aStudy) {
-		// boolean isOk = false;
-		// try {
-		// IndexService lucin = getIndex();
-		//
-		// for (Iterator<Scenario> i = aStudy.getScenariiList().iterator(); i
-		// .hasNext();) {
-		// Scenario scene = i.next();
-		// for (Iterator<KnowledgeElement> j = scene
-		// .getAllKnowledgeElements().iterator(); j.hasNext();) {
-		// KnowledgeElement kelm = j.next();
-		// lucin.update(kelm);
-		// }
-		// }
-		// isOk = true;
-		// } catch (Exception error) {
-		// LOG.error("Unable to re-index Knowledge Elements, reason:",
-		// error);
-		// }
-		// return isOk;
+//		boolean isOk = false;
+//		 try {
+//			 IndexService lucin = getIndex();
+//			 for(Scenario scenario : aStudy.getScenariiList()) {
+//				 for (KnowledgeElement element : scenario.getAllKnowledgeElements()) {
+//					 lucin.update(element);
+//				 }
+//			 }
+//			 isOk = true;
+//		 } catch (Exception error) {
+//			 LOG.error("Unable to re-index Knowledge Elements, reason:",
+//			 error);
+//		 }
+//		 return isOk;
 		return true;
 	}
 
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 965f780..a663ed5 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -425,7 +425,7 @@
 				page.editscenarioproperties
 			</result>
 		</action>
-		<action name="init-edit-readers" class="studyPropertiesAction"
+        <action name="init-edit-readers" class="studyPropertiesAction"
             method="initEditReaders">
             <result name="success" type="tiles">
                 page.editstudyproperties
@@ -583,9 +583,9 @@
 		</action>
 		<action name="setKnowledge" class="editKnowledgeElementAction"
 			method="setKnowledge">
-			<result name="success" type="tiles">
-				page.displaystudy
-			</result>
+			<result name="success" type="redirectAction">
+                study/open-study
+            </result>
 		</action>
 		<action name="remove-knowledge"
 			class="editKnowledgeElementAction" method="deleteKnowledge">