[MMBASE SCM] r41385 - mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate

[michiel]

Author: michiel
Date: 2010-03-15 23:47:25 +0100 (Mon, 15 Mar 2010)
New Revision: 41385

Modified:
   
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
Log:
ported from 1.9

Modified: 
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
===================================================================
--- 
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
   2010-03-15 22:31:27 UTC (rev 41384)
+++ 
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
   2010-03-15 22:47:25 UTC (rev 41385)
@@ -140,7 +140,7 @@
   <mm:import id="previousParameters" from="request" 
externid="org.mmbase.sr.relatednodes.parameters" />
   <!-- this is set by parameters.jspf.
        TODO.
-       -The prefix should probably by org.mmbase.searchrelate.relatednodes
+       -The prefix should probably be org.mmbase.searchrelate.relatednodes
        -Is this not exactly the same as org.mmbase.searchrelate.relatednodes
        -->
 
@@ -149,8 +149,8 @@
              id="parent" />
 
   <c:choose>
-    <c:when test="${empty parent}">
-      <mm:import id="requestid">R<mm:escape 
escape="crc32,radix(36)">${pageContext.request.requestURI}</mm:escape></mm:import>
+    <c:when test="${empty parent or ! empty param.requestID}">
+      <mm:import id="requestid">R<mm:escape 
escape="crc32,radix(36)">${pageContext.request.requestURI}</mm:escape>${param.requestID}</mm:import>
       <mm:import from="request" id="seq" externid="${requestid}_sequence" 
vartype="integer">0</mm:import>
     </c:when>
     <c:otherwise>
@@ -291,6 +291,7 @@
     </c:choose>
     <script type="text/javascript" 
src="${mm:link('/mmbase/jquery/jquery.timer.js')}"><jsp:text>&lt;!-- IE sucks 
--&gt;</jsp:text></script>
     <!-- TODO time js is more generic, of course -->
+
     <script type="text/javascript" 
src="${mm:link('/mmbase/searchrelate/Toggle.js.jsp')}"><jsp:text>&lt;!-- Help 
Freakin' IE --&gt;</jsp:text></script>
     <script type="text/javascript" 
src="${mm:link('/mmbase/searchrelate/List.js.jsp')}"><jsp:text>&lt;!-- Help 
Freakin' IE --&gt;</jsp:text></script>
     <script type="text/javascript" 
src="${mm:link('/mmbase/searchrelate/Searcher.js.jsp')}"><jsp:text>&lt;!-- Help 
Freakin' IE --&gt;</jsp:text></script>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs