From: mka <mka@opencascade.com>
Date: Thu, 31 Jan 2013 15:05:40 +0000 (+0000)
Subject: Left menu wrong shift for upload operation
X-Git-Tag: Root_Delivery2_2013_04_22~153
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e0f1769bde146bc0994967de678f83ea338f42d0;p=tools%2Fsiman.git

Left menu wrong shift for upload operation
---

diff --git a/Workspace/Siman/src/org/splat/simer/UploadAction.java b/Workspace/Siman/src/org/splat/simer/UploadAction.java
index 3084ed9..9137d96 100644
--- a/Workspace/Siman/src/org/splat/simer/UploadAction.java
+++ b/Workspace/Siman/src/org/splat/simer/UploadAction.java
@@ -65,11 +65,24 @@ public class UploadAction extends Action {
 	// ==============================================================================================================================
 
 	/**
-	 * Prepare form for the upload action.
+	 * Prepare form for the upload documents to study action.
 	 * 
 	 * @return SUCCESS
 	 */
-	public String doInitialize() {
+	public String doInitializeStudy() {
+		initializationFullScreenContext(Constants.STUDY_MENU,
+				Constants.STUDY_MENU, Constants.TRUE, Constants.NONE,
+				Constants.STUDY_MENU);
+
+		return SUCCESS;
+	}
+	
+	/**
+	 * Prepare form for the upload users action.
+	 * 
+	 * @return SUCCESS
+	 */
+	public String doInitializeSysAdmin() {
 		initializationFullScreenContext(Constants.STUDY_MENU,
 				Constants.STUDY_MENU, Constants.TRUE, Constants.NONE,
 				Constants.OPEN);
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 5683d74..051dd99 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -454,7 +454,7 @@
 		<!-- Edition of documents
 		-->
 		<action name="select-file" class="uploadAction"
-			method="initialize">
+			method="initializeStudy">
 			<result name="success" type="tiles">
 				page.uploadstudy
 			</result>
@@ -605,7 +605,7 @@
 			</result>
 		</action>
 		<action name="select-file" class="uploadAction"
-			method="initialize">
+			method="initializeSysAdmin">
 			<result name="success" type="tiles">
 				page.uploadsadmin
 			</result>