From: mka <mka@opencascade.com>
Date: Wed, 3 Apr 2013 15:00:27 +0000 (+0000)
Subject: Promote, Demote, Validate... operations are available without refresh operation.
X-Git-Tag: Root_Delivery2_2013_04_22~61
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a99d65a96128a255e96194c189d8510788b8ebeb;p=tools%2Fsiman.git

Promote, Demote, Validate... operations are available without refresh operation.
---

diff --git a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
index 8d37755..7e35326 100644
--- a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
+++ b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
@@ -48,11 +48,11 @@ public class DisplayStudyStepAction extends AbstractDisplayAction {
 		if (_myindex == null) {
 			if (_selection == null) { // Opening a study just newed
 				_selection = _openStudy.getSelection(); // Default selection
-			} else { // Re-opening (refreshing) the currently open study
-				_openStudy = open(getStudyService().selectStudy(
-						_openStudy.getIndex())); // Closes the previously open study
-				_openStudy.setSelection(_selection);
-			}
+			} 
+			// Re-opening (refreshing) the currently open study
+			_openStudy = open(getStudyService().selectStudy(
+					_openStudy.getIndex())); // Closes the previously open study
+			_openStudy.setSelection(_selection);
 		} else {
 			try { // Opening a study from the search result
 				int index = Integer.valueOf(_myindex);
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 23c10e3..965f780 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -97,11 +97,12 @@
 		</action>
 		<action name="login" class="connectionAction" method="login">
 			<result name="none" type="tiles">page.home</result>
+            <result name="create" type="tiles">page.home</result>
 			<result name="open" type="redirectAction">
 				select?menu=search
 			</result>
 			<result name="study" type="redirectAction">
-				study/step-study
+				study/open-study
 			</result>
 			<result name="knowledge" type="redirectAction">
 				study/step-knowledge
@@ -127,9 +128,9 @@
 			<result name="sysadmin" type="tiles">page.home</result>
 		</action>
 		<action name="select" class="menuAction" method="selectItem">
-            <result name="new-empty" type="redirectAction">
-                study/new-empty
-            </result>
+			<result name="new-empty" type="redirectAction">
+				study/new-empty
+			</result>
             <result name="new-copy" type="redirectAction">
                 study/new-copy
             </result>
@@ -185,21 +186,21 @@
 			<result name="success">/study/jsonCheckoutRes.jsp</result>
 		</action>
 
-        <!-- Creation of a study
-        -->
-        <action name="new-empty" class="newStudyAction"
-            method="initialize">
-            <result name="success" type="tiles">page.newstudy</result>
-        </action>
-        <action name="valid-new" class="newStudyAction"
-            method="create">
-            <!--interceptor-ref name="siman-validation" /-->
-            <result name="success" type="redirectAction">
-                open-study?selection=0.1
-            </result>
-            <result name="input" type="tiles">page.newstudy</result>
-            <result name="error" type="tiles">page.home</result>
-        </action>
+		<!-- Creation of a study
+		-->
+		<action name="new-empty" class="newStudyAction"
+			method="initialize">
+			<result name="success" type="tiles">page.newstudy</result>
+		</action>
+		<action name="valid-new" class="newStudyAction"
+			method="create">
+			<!--interceptor-ref name="siman-validation" /-->
+			<result name="success" type="redirectAction">
+				open-study?selection=0.1
+			</result>
+			<result name="input" type="tiles">page.newstudy</result>
+			<result name="error" type="tiles">page.home</result>
+		</action>
 
         <!-- Creation of a new study from existing one
         -->