From: mka <mka@opencascade.com>
Date: Wed, 3 Apr 2013 12:31:10 +0000 (+0000)
Subject: Rename the document functionality is improved. Now if several documents are added... 
X-Git-Tag: Root_Delivery2_2013_04_22~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b8084c1da6717d60d3f61d021dbe0f0e5c3bf25c;p=tools%2Fsiman.git

Rename the document functionality is improved. Now if several documents are added to the activity it is possible to rename each of it separately.
---

diff --git a/Workspace/Siman/WebContent/jsp/editContents.jsp b/Workspace/Siman/WebContent/jsp/editContents.jsp
index 656d729..91797a1 100644
--- 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 135444c..ee5b949 100644
--- 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.
 	 *