From: mka <mka@opencascade.com>
Date: Tue, 4 Dec 2012 10:48:05 +0000 (+0000)
Subject: Pop-up menus are corrected. Edit disabled property for creation of the title bar... 
X-Git-Tag: Root_Delivery1_2012_12_06~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eeefbb20a1ff2c15864e8bda3bab1d4edb74b4f5;p=tools%2Fsiman.git

Pop-up menus are corrected. Edit disabled property for creation of the title bar is took into account
---

diff --git a/Workspace/Siman/WebContent/jsp/titlebar.jsp b/Workspace/Siman/WebContent/jsp/titlebar.jsp
index 2312284..36ce437 100644
--- a/Workspace/Siman/WebContent/jsp/titlebar.jsp
+++ b/Workspace/Siman/WebContent/jsp/titlebar.jsp
@@ -6,7 +6,7 @@
 %>
 
 <s:set var="entitype" value="titleBarSettings.entryType" />
-<s:set var="disabled" value="titleBarSettings.closeDisabledProperty" />
+<s:set var="disabled" value="titleBarSettings.editDisabledProperty" />
 <s:set var="proxtate" value="titleBarSettings.progressState" />
 
 <s:url id="close"   namespace="/study" action="close-%{#entitype}"></s:url>
diff --git a/Workspace/Siman/src/org/splat/simer/UploadAction.java b/Workspace/Siman/src/org/splat/simer/UploadAction.java
index 4b9432b..ce5b166 100644
--- a/Workspace/Siman/src/org/splat/simer/UploadAction.java
+++ b/Workspace/Siman/src/org/splat/simer/UploadAction.java
@@ -99,8 +99,10 @@ public class UploadAction extends Action {
 		setMenuProperty(Constants.STUDY_MENU);
 		setToolProperty(Constants.NONE);
 		setLeftMenuProperty("open");
-		initializationFullScreenContext(_menuProperty, _toolProperty,
-				_leftMenuProperty);
+		setTitleProperty(Constants.STUDY_MENU);
+		setEditDisabledProperty("true");
+		initializationFullScreenContext(_menuProperty, _titleProperty,
+				_editDisabledProperty, _toolProperty, _leftMenuProperty);
 
 		return SUCCESS;
 	}