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

diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp
index bd5f0150e29f572e7e83bb5aa540c43047cfc3e2..e2543014966c67030574d56c08099a2881a22fed 100644 (file)
--- 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 d4ec04a805a6e1bc4085a39183710483a78022b4..50e641ad5874bc476b94ee1c1d0594de592a9123 100644 (file)
--- 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 a6281ff906bd2a08940e29b23ab979c3c6e8ee85..aa73faf406643b35949097108780a751ae57cbae 100644 (file)
--- 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 ed7628ad03204823ca31b14eda4cfc2a87d53587..901495af93ba1f777ce25c6fee101e8cef0175ae 100644 (file)
--- 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>();