displayStudy.jsp is removed, markup is fixed. KnowledgeElement deleting is fixed.

[tools/siman.git] / Workspace / Siman / WebContent / jsp / editContext.jsp

diff --git a/Workspace/Siman/WebContent/jsp/editContext.jsp b/Workspace/Siman/WebContent/jsp/editContext.jsp
index 983161d3d072f036b7746d5591532facdfdea808..273d7b82fb4529ae43757242d8ae70f34ea7d349 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/editContext.jsp
+++ b/Workspace/Siman/WebContent/jsp/editContext.jsp
@@ -3,13 +3,11 @@
 %>
 <%@ taglib prefix="s" uri="/struts-tags"
 %>
-<s:set var="todo"><%=request.getParameter("action")%></s:set>
-<s:set var="type"><%=request.getParameter("type")%></s:set>
 <s:url id="undo" namespace="/study" action="step-study"></s:url>
 
 <!-- Selection of an existing type of simulation context
   -->
-<s:if test="%{#todo == 'selectContext'}">
+<s:if test="%{action == 'selectContext'}">
   <table cellpadding=0 cellspacing=0 border=0 class=text>
     <tr height=2><td></td></tr>
   <s:iterator value="simulationContexts">
@@ -82,7 +80,7 @@
 <!-- Input of a new type of simulation context
 -->
   <table cellpadding=0 cellspacing=0 border=0 class=text>
-    <s:if test="%{#todo == 'newContext'}">
+    <s:if test="%{action == 'newContext'}">
     <tr height=18>
       <td width=18 align=center>
         <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
@@ -99,7 +97,7 @@
 
 <!-- Input of a value of the selected simulation context type
   -->
-    <s:elseif test="%{#todo == 'setContext'}">
+    <s:elseif test="%{action == 'setContext'}">
     <tr height=18>
       <td width=18 align=center>
         <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
@@ -121,7 +119,7 @@
           </select>
         </td>
         <td id=enter style="display: none">
-          <input type=hidden name=contextType value="<s:property value="%{#type}"/>">
+          <input type=hidden name=contextType value="<s:property value="index"/>">
           <input type=text  name=contextValue>
         </td>
               <td>
@@ -132,7 +130,7 @@
       </s:if>
       <s:else>
         <td>
-          <input type=hidden name=contextType value="<s:property value="%{#type}"/>">
+          <input type=hidden name=contextType value="<s:property value="index"/>">
           <input type=hidden name=contextValue value="0">
           <input type=text   name=contextValue>
         </td>