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

diff --git a/Workspace/Siman/WebContent/jsp/titlebar.jsp b/Workspace/Siman/WebContent/jsp/titlebar.jsp
index 2312284b3edbb07d0ac160a6cc1b8281d57a0da7..36ce4370b88bb4bdfb0470c0151b915312d4cf0a 100644 (file)
--- 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 4b9432bb8cb311bddbb00a3d3e873f3a85383e42..ce5b166e28246b332a94d77c4980b512bb2ccae6 100644 (file)
--- 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;
        }