Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core
In directory james.mmbase.org:/tmp/cvs-serv31253
Modified Files:
blocks.tagx
Log Message:
don't change the current node-provider
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core
Index: blocks.tagx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/blocks.tagx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- blocks.tagx 13 Aug 2008 12:52:33 -0000 1.6
+++ blocks.tagx 21 Aug 2008 08:34:03 -0000 1.7
@@ -19,26 +19,24 @@
<mm:param name="id">didactor.${classification}</mm:param>
<mm:listfunction set="components" name="blockClassification">
<mm:stringlist referid="_.blocks">
+
<di:component name="${_.component.name}">
<c:choose>
<c:when test="${! empty _component.scopesMap.educations}">
<mm:node number="${_component.number}">
<mm:relation role="settingrel" to="${education}">
- <mm:first>
- <jsp:invoke fragment="beforefirst" />
- </mm:first>
- <jsp:doBody />
- <mm:component name="${_.component.name}"
block="${_.name}" />
- <mm:last inverse="true">
- <jsp:invoke fragment="separator" />
- </mm:last>
- <mm:last>
- <jsp:invoke fragment="afterlast" />
- </mm:last>
+ <mm:import id="do" />
</mm:relation>
</mm:node>
</c:when>
<c:otherwise>
+ <mm:import id="do" />
+ </c:otherwise>
+ </c:choose>
+ </di:component>
+
+
+ <mm:present referid="do">
<mm:first>
<jsp:invoke fragment="beforefirst" />
</mm:first>
@@ -50,12 +48,14 @@
<mm:last>
<jsp:invoke fragment="afterlast" />
</mm:last>
- </c:otherwise>
- </c:choose>
- </di:component>
+ </mm:present>
+ <mm:remove referid="do" />
+
</mm:stringlist>
+
</mm:listfunction>
</mm:functioncontainer>
+
</div>
</mm:hasfunction>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
