Rename the document functionality is improved. Now if several documents are added...

diff --git a/Workspace/Siman/WebContent/jsp/editContents.jsp b/Workspace/Siman/WebContent/jsp/editContents.jsp
index 656d729295ed4c3e9224abd3942a3dbf01e2d396..91797a1f82d6539ce5bf7a98689a66c24832cadf 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/editContents.jsp
+++ b/Workspace/Siman/WebContent/jsp/editContents.jsp
@@ -29,12 +29,13 @@
   </tr>
   <tr height=1 bgcolor=#AAAAAA><td colspan=7></td></tr>
   <s:if test="documents.size > 0">
+  <s:set var="selectedDocIndex" value="%{index}"/>
     <s:iterator value="documents">
       <s:set var="docindex" value="%{index}"/>
       <tr height=18>
         <td>
           <s:if test="%{curAction == 'renameDocument'}">
-            <s:if test="%{index == #docindex}">
+            <s:if test="%{#selectedDocIndex == #docindex}">
               <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
             </s:if><s:else>
               <img src="<s:url value="/skin/image.box.png"/>"  border="none" title=""/>
@@ -61,7 +62,7 @@
         <td><img src="<s:url value="/skin/%{fileIcon}"/>" border="none" title=""/></td>
         <td>
           <s:if test="%{curAction == 'renameDocument'}">
-            <s:if test="%{index == #docindex}">
+            <s:if test="%{#selectedDocIndex == #docindex}">
               <input type="hidden" name="action" value="renameDocument" />
               <input type="hidden" name="index" value="<s:property value="index"/>" />
               <input type="text"   name="documentTitle" size="60" value="<s:property value="title"/>" />

diff --git a/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java b/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
index 135444c2cbeae4300d52fd8e31f2a12731a889aa..ee5b9492e46ebe76626640ffa6f47b2c1b095f47 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
@@ -179,6 +179,15 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                this._index = index;
        }
 
+       /**
+        * Get the index.
+        * @return the index
+        */
+       @Override
+       public String getIndex() {
+               return _index;
+       }
+       
        /**
         * Get the publicationService.
         *