From: rkv <rkv@opencascade.com>
Date: Thu, 18 Apr 2013 07:34:41 +0000 (+0000)
Subject: Fix of study modification date in study properties section and admin display name... 
X-Git-Tag: Root_Delivery2_2013_04_22~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9002be879d1886cdaca2774a6333fe2397b6ad17;p=tools%2Fsiman.git

Fix of study modification date in study properties section and admin display name in search screens.
---

diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp
index bd5f015..e254301 100644
--- a/Workspace/Siman/WebContent/jsp/toolbar.jsp
+++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp
@@ -6,7 +6,7 @@
 	<s:param name="menu">configuration</s:param>
 </s:url>
 <s:url id="scenario" namespace="/study" action="add-scenario"></s:url>
-<s:url id="idea" namespace="/study" action="notyetimplemented"></s:url>
+<s:url id="idea" namespace="/study" action="search-knowledge"></s:url>
 <s:url id="back" namespace="/study" action="step-study"></s:url>
 
 <table width=100% border=0 cellspacing=0 cellpadding=0>
diff --git a/Workspace/Siman/WebContent/study/searchKnowledge.jsp b/Workspace/Siman/WebContent/study/searchKnowledge.jsp
index d4ec04a..50e641a 100644
--- a/Workspace/Siman/WebContent/study/searchKnowledge.jsp
+++ b/Workspace/Siman/WebContent/study/searchKnowledge.jsp
@@ -60,7 +60,7 @@ $(document).ready(function () {
 					style='width: <s:text name="size.search.select"/>' onChange="changeFilter()">
 					<option value="0"><s:text name="criterion.anybody" /></option>
 					<s:iterator value="candidates">
-						<s:if test="%{index == author}">
+						<s:if test="%{index == filter.author}">
 							<option value="<s:property value="index"/>" selected><s:property
 								value="toString()" /></option>
 						</s:if>
@@ -207,7 +207,7 @@ $(document).ready(function () {
 				</s:url> <s:a href="%{open}" cssClass="link">
 					<s:property value="title" />
 				</s:a></td>
-				<td><s:property value="authorName" /></td>
+				<td><s:property value="getText(authorName)" /></td>
 			</tr>
 		</s:iterator>
 	</table>
diff --git a/Workspace/Siman/WebContent/study/searchStudy.jsp b/Workspace/Siman/WebContent/study/searchStudy.jsp
index a6281ff..aa73faf 100644
--- a/Workspace/Siman/WebContent/study/searchStudy.jsp
+++ b/Workspace/Siman/WebContent/study/searchStudy.jsp
@@ -210,7 +210,7 @@ $(document).ready(function () {
 				</s:url> <s:a href="%{open}" cssClass="link">
 					<s:property value="title" />
 				</s:a></td>
-				<td><s:property value="authorName" /></td>
+				<td><s:property value="getText(authorName)" /></td>
 			</tr>
 		</s:iterator>
 	</table>
diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
index ed7628a..901495a 100644
--- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
@@ -131,7 +131,7 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 		// Preparation of the display
 		_version = verstring.format(_mystudy.getVersion());
 		_credate = datstring.format(_mystudy.getDate());
-		_lasdate = ""; // Not yet supported
+		_lasdate = datstring.format(_mystudy.getLastModificationDate());
 		_description = _mystudy.getDescription();
 		_involving = new ArrayList<Step>(1);
 		_context = new ArrayList<SimulationContextFacade>();