Update of 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards
In directory james.mmbase.org:/tmp/cvs-serv23441

Modified Files:
        roles.jsp roles_cmd.jsp 
Log Message:
jspx, cleaned up, removed dependency on progress app


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards


Index: roles.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- roles.jsp   1 Feb 2008 15:29:33 -0000       1.17
+++ roles.jsp   1 Feb 2008 15:38:37 -0000       1.18
@@ -56,7 +56,7 @@
                         <mm:param name="command">deleterole</mm:param>
                         <td>
                           <a href="${_}"
-                             onClick="return 
doDelete('${di:translate('education.areyousuredelrole')}');"
+                             onClick="return 
confirm('${di:translate('education.areyousuredelrole')}');"
                              target="text">
                             <img 
src="${mm:treelink('/education/wizards/gfx/minus.gif', includePath)}"
                                  border="0"


Index: roles_cmd.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/roles_cmd.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- roles_cmd.jsp       1 Feb 2008 15:29:33 -0000       1.6
+++ roles_cmd.jsp       1 Feb 2008 15:38:37 -0000       1.7
@@ -20,6 +20,7 @@
       <mm:compare referid="command" value="accept">
         <di:has editcontext="rollen" action="rw">
           <mm:listnodes type="editcontexts" orderby="number" 
id="this_editcontext">
+            <mm:context>
             <mm:listnodes type="roles" orderby="number" id="this_role">
               <mm:import id="select" 
externid="select_${this_editcontext}_${this_role}">0</mm:import>
               <mm:related path="posrel,editcontexts" 
constraints="editcontexts.number='$this_editcontext'">
@@ -32,13 +33,14 @@
                   </mm:field>
                 </mm:node>
               </mm:related>
-              <mm:notpresent referid="old_rel">
+                <c:if test="${empty old_rel}">
                 <mm:createrelation role="posrel" source="this_role" 
destination="this_editcontext">
                   <p>Creating relation ${this_role} -> ${this_editcontext}</p>
                   <mm:setfield name="pos">${select}</mm:setfield>
                 </mm:createrelation>
-              </mm:notpresent>
+                </c:if>
             </mm:listnodes>
+            </mm:context>
           </mm:listnodes>
         </di:has>
         <di:has editcontext="rollen" action="rw" inverse="true">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to