Author: michiel
Date: 2010-02-01 12:02:22 +0100 (Mon, 01 Feb 2010)
New Revision: 40755
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
Log:
passing 'load' better
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
2010-02-01 10:35:31 UTC (rev 40754)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
2010-02-01 11:02:22 UTC (rev 40755)
@@ -279,7 +279,9 @@
<mm:import from="request" id="javascript_loaded"
externid="mm_list_javascript" />
- <c:if test="${empty parent and ((empty javascript_loaded and empty load) or
load) and load ne 'false'}">
+
+ <mm:import id="_load">${empty parent and ((empty javascript_loaded and empty
load) or load) and load ne 'false'}</mm:import>
+ <c:if test="${_load}">
<mm:include page="/mmbase/jquery/ajaxfileupload.jspx" />
<c:choose>
<c:when test="${sortable}">
@@ -336,12 +338,12 @@
<mm:cloud>
<c:choose>
<c:when test="${empty searchRepository}">
- <mm-sr:search type="${query.nodeManager.name}" load="${empty
load ? true : load}" implicit="${empty implicitSearch ?
settings['implicitRepository'] : implicitSearch}">
+ <mm-sr:search type="${query.nodeManager.name}" load="${_load}"
implicit="${empty implicitSearch ? settings['implicitRepository'] :
implicitSearch}">
<mm:constraint field="number" operator="IN" inverse="true"
referid="related" />
</mm-sr:search>
</c:when>
<c:otherwise>
- <mm-sr:relate repository="${searchRepository}" load="${empty
load ? true : load}">
+ <mm-sr:relate repository="${searchRepository}" load="${_load}">
<mm:constraint field="number" operator="IN" inverse="true"
referid="related" />
</mm-sr:relate>
</c:otherwise>
@@ -393,6 +395,6 @@
</c:if>
</div>
</fmt:bundle>
- <mm:write request="org.mmbase.searchrelate.relatednodes"
referid="parameters.parent" />
+ <mm:write request="org.mmbase.searchrelate.relatednodes"
referid="parameters.parent" />
<mm:write request="org.mmbase.sr.relatednodes.parameters"
referid="previousParameters" />
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
