Author: michiel
Date: 2009-08-13 15:34:33 +0200 (Thu, 13 Aug 2009)
New Revision: 37788
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.jspx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/unlink.jspx
Log:
details
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
2009-08-13 13:33:22 UTC (rev 37787)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes.jspx
2009-08-13 13:34:33 UTC (rev 37788)
@@ -12,8 +12,10 @@
expires="0"
language="en">
<!--
- xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
+ xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
+
+
-->
<mm:cloud rank="administrator">
@@ -22,11 +24,10 @@
</head>
<body>
<h1>Search and Relate examples/tests</h1>
-
+ <!--
<script type="text/javascript" src="test.js" />
- <mm:form id="testform123"
- name="testform123"
- >
+ -->
+ <mm:form name="testform123">
<mm:import externid="cancel" />
<mm:present referid="cancel">
@@ -75,7 +76,7 @@
<c:set value="${requestScope['org.mmbase.transaction'].nodes}"
var="tn" />
<p>Number of nodes in transaction: ${fn:length(tn)}</p>
<table>
- <tr><th>#</th><th>real number</th><th>temporary
number</th><td>_exists</td><th>new</th><th>deleted</th></tr>
+ <tr><th>#</th><th>real number</th><th>temporary
number</th><th>_exists</th><th>new</th><th>deleted</th></tr>
<mm:listnodes referid="tn" commitonclose="false">
<tr>
<th><mm:index /></th>
@@ -83,7 +84,7 @@
<td>${_node._number}</td>
<td>${_node._exists}</td>
<td>${_node.number lt 0}</td>
- <td>${_node._exists eq 'nolonger'}</td>
+ <td>${_node._exists eq 'nolonger' or _node._exists eq 'no' or
empty _node._number}</td>
</tr>
</mm:listnodes>
</table>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
2009-08-13 13:33:22 UTC (rev 37787)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/deletedConstraint.tagx
2009-08-13 13:34:33 UTC (rev 37788)
@@ -18,18 +18,21 @@
</c:if>
<c:if test="${! empty parameters.formtag}">
- <mm:transaction
- name="${parameters.formtag}"
- id="${parameters.formtag}" commitonclose="false">
- <c:set value="${requestScope['org.mmbase.transaction'].nodes}" var="tn"
/>
- <c:forEach items="${parameters.query.steps}" var="step">
- <mm:listnodes referid="tn" commitonclose="false">
- <c:if test="${_node._exists eq 'nolonger'}"> <!-- DELETED! -->
- <mm:constraint field="${step.alias}.number" inverse="true"
value="${_node.number}" />
- </c:if>
- </mm:listnodes>
- </c:forEach>
- </mm:transaction>
+
+ <mm:cloud method="asis"> <!-- makes sure the current cloud is not already
the tranaction -->
+ <mm:transaction
+ name="${parameters.formtag}"
+ id="${parameters.formtag}" commitonclose="false">
+ <c:set value="${requestScope['org.mmbase.transaction'].nodes}"
var="tn" />
+ <c:forEach items="${parameters.query.steps}" var="step">
+ <mm:listnodes referid="tn" commitonclose="false">
+ <c:if test="${_node._exists eq 'nolonger' or _node._exists eq 'no'
or empty _node._number}"> <!-- DELETED! -->
+ <mm:constraint field="${step.alias}.number" inverse="true"
value="${_node.number}" />
+ </c:if>
+ </mm:listnodes>
+ </c:forEach>
+ </mm:transaction>
+ </mm:cloud>
</c:if>
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
2009-08-13 13:33:22 UTC (rev 37787)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
2009-08-13 13:34:33 UTC (rev 37788)
@@ -103,7 +103,7 @@
<mm:import id="_role">${empty role and empty path ? 'posrel' :
role}</mm:import><!-- role defaults to 'posrel' -->
<mm:import id="_direction">${empty direction? 'UP' :
direction}</mm:import><!-- defaults to UP -->
<mm:import id="_createposition">${empty createposition? 'bottom' :
createposition}</mm:import>
- <mm:import
id="_formtag">${requestScope['org.mmbase.bridge.jsp.taglib.form'].id}</mm:import>
+ <mm:import
id="_formtag">${requestScope['org.mmbase.bridge.jsp.taglib.form'].name}</mm:import>
<mm:import id="_orderby">${empty orderby ? _role : orderby}${empty orderby ?
(_role eq 'posrel' ? '.pos' : '.number') : ''}</mm:import>
<mm:import id="_fields">${fields}</mm:import>
<mm:import id="_search">${empty search ? false : search}</mm:import>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.jspx
2009-08-13 13:33:22 UTC (rev 37787)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/delete.jspx
2009-08-13 13:34:33 UTC (rev 37788)
@@ -7,15 +7,16 @@
<jsp:output omit-xml-declaration="true" />
<li>
<mm:import externid="n" required="true" />
- <mm:import externid="source" required="true" />
- <mm:import externid="formtag" />
+ <jsp:directive.include file="parameters.jspf" />
<mm:cloud method="asis">
<c:choose>
- <c:when test="${empty formtag}">
+ <c:when test="${empty parameters.formtag}">
<jsp:directive.include file="delete.body.jspx" />
</c:when>
<c:otherwise>
- <mm:transaction id="${formtag}">
+ <mm:transaction id="${parameters.formtag}"
+ name="${parameters.formtag}"
+ commitonclose="false">
<jsp:directive.include file="delete.body.jspx" />
</mm:transaction>
</c:otherwise>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/unlink.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/unlink.jspx
2009-08-13 13:33:22 UTC (rev 37787)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/unlink.jspx
2009-08-13 13:34:33 UTC (rev 37788)
@@ -15,7 +15,9 @@
<jsp:directive.include file="unlink.body.jspx" />
</c:when>
<c:otherwise>
- <mm:transaction id="${parameters.formtag}">
+ <mm:transaction id="${parameters.formtag}"
+ name="${parameters.formtag}"
+ commitonclose="false">
<jsp:directive.include file="unlink.body.jspx" />
</mm:transaction>
</c:otherwise>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
