Author: michiel
Date: 2010-07-06 12:09:04 +0200 (Tue, 06 Jul 2010)
New Revision: 42813
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/page.jspx
Log:
if list contains items of differnt types, don't show differnt number of fields,
that would correspond with the header
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
2010-07-06 08:23:58 UTC (rev 42812)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/node.tr.jspx
2010-07-06 10:09:04 UTC (rev 42813)
@@ -9,6 +9,7 @@
<mm:import externid="status" from="request" />
<mm:import externid="id" required="true" from="request,parameters" />
<mm:import externid="node" required="true" from="request,parameters" />
+ <mm:import id="searchnodemanager" externid="nodemanager"
required="true" from="request,parameters" />
<mm:import externid="fields" from="request,parameters" />
<mm:import externid="aliases" from="request,parameters" />
<mm:import externid="editrelations" from="request,parameters" />
@@ -36,7 +37,7 @@
</c:when>
<c:otherwise>
<td class="node gui"><mm:nodeinfo type="gui" /></td>
- <mm:fieldlist type="list" varStatus="field">
+ <mm:fieldlist nodetype="${searchnodemanager}" type="list"
varStatus="field">
<td class="fields ${field.current.name}"><mm:fieldinfo
type="guivalue" /></td>
</mm:fieldlist>
</c:otherwise>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/page.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/page.jspx
2010-07-06 08:23:58 UTC (rev 42812)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/page.jspx
2010-07-06 10:09:04 UTC (rev 42813)
@@ -14,7 +14,7 @@
<jsp:output omit-xml-declaration="true" />
<jsp:directive.page
import="org.mmbase.bridge.util.Queries,org.mmbase.bridge.NodeList" />
<mm:import externid="id" from="parameters" required="true" />
- <mm:import from="session" externid="${id}" id="query" jspvar="q"
required="true" vartype="org.mmbase.bridge.Query" />
+ <mm:import from="session" externid="${id}" id="query" jspvar="q"
required="true" vartype="org.mmbase.bridge.NodeQuery" />
<mm:content expires="0" type="application/xml"
language="${query.cloud.locale}">
<fmt:bundle basename="org.mmbase.searchrelate.resources.searchrelate">
<mm:import externid="search" from="parameters" />
@@ -136,6 +136,7 @@
<mm:import id="relations" vartype="List" />
</mm:compare>
+
<mm:listnodes varStatus="status" jspvar="n">
<mm:compare referid="id" regexp="\w*current">
@@ -155,7 +156,9 @@
</mm:isnotempty>
</mm:compare>
- <mm:include page="node.tr.jspx"
attributes="status,_n...@node,customizedir?,f...@fields?,editrelations?,relation?,aliases?"
/>
+ <mm:include page="node.tr.jspx"
attributes="status,_n...@node,customizedir?,f...@fields?,editrelations?,relation?,aliases?">
+ <mm:param
name="nodemanager">${query.nodeManager.name}</mm:param>
+ </mm:include>
<c:if test="${editrelations == true}">
<mm:compare referid="id" regexp="\w*current">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
