Update of /var/cvs/applications/richtext/META-INF/tags/mm/rich
In directory james.mmbase.org:/tmp/cvs-serv12899
Modified Files:
kupulink.tagx
Log Message:
kupu_back should include the context path. Wile referrer should not necessaly
do that.
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/META-INF/tags/mm/rich
Index: kupulink.tagx
===================================================================
RCS file: /var/cvs/applications/richtext/META-INF/tags/mm/rich/kupulink.tagx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- kupulink.tagx 3 Oct 2008 08:47:12 -0000 1.4
+++ kupulink.tagx 30 Oct 2008 13:32:43 -0000 1.5
@@ -7,14 +7,23 @@
<jsp:directive.attribute name="wizard" type="java.lang.String"
required="true" />
<jsp:directive.attribute name="node" type="java.lang.Object"
required="true" />
<jsp:directive.attribute name="referrer" type="java.lang.String"
required="true" />
- <jsp:directive.attribute name="kupu_back" type="java.lang.String" />
+ <jsp:directive.attribute name="kupu_back" type="java.lang.String"
+ description="Link to be used for the arrow. Should
include the context path."
+ />
<jsp:directive.variable name-given="_" />
<jsp:directive.variable name-given="org.mmbase.richtext.kupulink" />
<mm:link
page="/mmbase/kupu/mmbase"
referids="referrer,[EMAIL PROTECTED],[EMAIL PROTECTED],wizard">
- <mm:param name="kupu_back">${empty kupu_back ? referrer :
kupu_back}</mm:param>
+ <mm:param name="kupu_back">
+ <c:choose>
+ <c:when test="${empty kupu_back}">
+ <mm:url page="${referrer}" />
+ </c:when>
+ <c:otherwise>kupu_back</c:otherwise>
+ </c:choose>
+ </mm:param>
<mm:param name="objectnumber">${node}</mm:param>
<c:set var="org.mmbase.richtext.kupulink" value="${_}" />
<jsp:doBody />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
