Author: michiel
Date: 2010-02-17 09:54:07 +0100 (Wed, 17 Feb 2010)
New Revision: 41083
Modified:
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/index.jspx
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/item.jspx
Log:
some changes in mm:node and mm-sr made this break. This fixes it again
Modified:
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/index.jspx
===================================================================
---
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/index.jspx
2010-02-17 08:32:18 UTC (rev 41082)
+++
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/index.jspx
2010-02-17 08:54:07 UTC (rev 41083)
@@ -8,7 +8,6 @@
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
version="2.0">
-
<!-- TODO this is didactor specific -->
<mm:node number="Default.Background" notfound="skip">
<mm:import id="background">url('<mm:image
template="${di:setting('education',
'background_image_template')}"/>')</mm:import>
@@ -41,7 +40,7 @@
</c:if>
- <mm:node number="${source}">
+ <mm:node number="${source}" emptynumberiscurrentnode="true">
<!-- source may be empty, in which case it will be the current node,
as provided by the framework. -->
@@ -55,7 +54,7 @@
<mm:param name="key">shouts.previous_check</mm:param>
<mm:function name="set" write="false" />
</mm:functioncontainer>
-
+
<mm:functioncontainer nodemanager="properties">
<mm:param name="node" referid="_node" />
<mm:param name="value"><mm:time time="now" /></mm:param>
@@ -71,15 +70,15 @@
<mm:param
name="key">shouts.previous_check_source${source}</mm:param>
<mm:function name="set" write="false" />
</mm:functioncontainer>
-
+
<mm:functioncontainer nodemanager="properties">
<mm:param name="node" referid="_node" />
<mm:param name="value"><mm:time time="now" /></mm:param>
<mm:function name="set" referids="key" write="false" />
</mm:functioncontainer>
-
+
</c:if>
-
+
</mm:hasnodemanager>
@@ -90,7 +89,7 @@
</fmt:message>
</h2>
</c:if>
-
+
<form action="index">
<c:if test="${! empty source}">
<input type="hidden" name="source" value="${source}" />
@@ -115,6 +114,7 @@
<mm-sr:relatednodes
type="shouts"
role="posrel"
+ create="${self eq 'only'}"
item="/mmbase/components/shoutbox/item.jspx"
orderby="posrel.pos" direction="down"
createposition="top">
<jsp:attribute name="constraints">
Modified:
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/item.jspx
===================================================================
---
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/item.jspx
2010-02-17 08:32:18 UTC (rev 41082)
+++
didactor/trunk/components/shoutbox/src/main/webapp/mmbase/components/shoutbox/item.jspx
2010-02-17 08:54:07 UTC (rev 41083)
@@ -5,15 +5,13 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
version="2.0">
<jsp:output omit-xml-declaration="true"/>
- <mm:import externid="source" required="true"/>
- <mm:import externid="confirm"/>
- <mm:import externid="icondir"/>
- <mm:import externid="new"/>
+ <jsp:directive.include file="/mmbase/searchrelate/list/parameters.jspf" />
+ <mm:import externid="new" />
<fieldset>
<legend><mm:nodeinfo type="guinodemanager" /></legend>
<mm:hasnodemanager name="properties">
<mm:import id="key">shouts.previous_check</mm:import>
- <mm:function id="previous" nodemanager="properties" name="get"
referids="key,sou...@node" write="false" />
+ <mm:function id="previous" nodemanager="properties" name="get"
referids="key,parameters.sou...@node" write="false" />
</mm:hasnodemanager>
<ul class="${_node.time ge previous ? 'new' : 'old'}">
<mm:fieldlist type="edit" varStatus="status">
@@ -22,16 +20,16 @@
<label for="${_}"><mm:fieldinfo type="guiname"/>:</label>
</mm:fieldinfo>
<pre>
- <mm:fieldinfo type="${empty new ? 'guivalue' : 'input'}"
+ <mm:fieldinfo type="${empty new ? 'guivalue' : 'input'}"
/>
</pre>
<mm:fieldinfo type="errors"/>
</li>
</mm:fieldlist>
- <c:if test="${new ge ''}" >
+ <c:if test="${! empty new}" >
<li><a class="create" href="">verstuur</a></li>
</c:if>
</ul>
- <mm-sr:delete source="${source}" confirm="${confirm}"
icondir="${icondir}"/>
+ <mm-sr:delete />
</fieldset>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
