Update of /var/cvs/contributions/didactor2/src/core/metainf/tags/di/core
In directory james.mmbase.org:/tmp/cvs-serv8872

Modified Files:
        kupulink.tagx 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/metainf/tags/di/core


Index: kupulink.tagx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/core/metainf/tags/di/core/kupulink.tagx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- kupulink.tagx       5 Sep 2008 15:20:16 -0000       1.3
+++ kupulink.tagx       2 Oct 2008 12:16:16 -0000       1.4
@@ -16,13 +16,13 @@
       wizard="${wizard}"
       node="${node}"
       referrer="${referrer}">
+
     <mm:param name="style"><mm:treefile page="/kupu" absolute="context" 
objectlist="$includePath" /></mm:param>
     <mm:param name="templates">/editwizards/data</mm:param>
     <mm:param name="link_nodetypes">${di:setting('richtext', 
'link_nodetypes')}</mm:param>
 
 
-    <c:choose>
-      <c:when test="${node eq 'new'}">
+    <c:if test="${node eq 'new'}">
         <mm:import externid="kupulink_seq" from="request" 
vartype="int">0</mm:import>
         <!-- determin the type it is going to have
              we need to know that to know whether background image links must 
be produced.
@@ -46,13 +46,11 @@
         </mm:haspage>
         <mm:import id="node" reset="true">${kupulink_seq}</mm:import>
         <mm:write request="kupulink_seq" value="${kupulink_seq + 1}" />
-      </c:when>
-      <c:otherwise>
-        <mm:node id="sourcemanager" referid="node" />
-      </c:otherwise>
-    </c:choose>
+    </c:if>
 
     <!-- support for backgraound -->
+    <c:if test="${! empty _node}">
+      <mm:node referid="node" id="sourcemanager" />
     <mm:hasrelationmanager sourcemanager="$sourcemanager" 
destinationmanager="images"
                            role="background">
       <mm:relatednodescontainer id="current" type="images" role="background">
@@ -65,9 +63,8 @@
       <mm:param name="currentTitle"><di:translate key="rich.backgroundimage" 
/></mm:param>
       <mm:param name="tools">searchrelate</mm:param>
     </mm:hasrelationmanager>
+    </c:if>
 
-    <mm:write value="${pageScope['org.mmbase.richtext.kupulink']}" 
escape="none">
       <jsp:doBody />
-    </mm:write>
   </mm-r:kupulink>
 </jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to