You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/31 09:28:27 UTC
svn commit: r427033 -
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
Author: cziegeler
Date: Mon Jul 31 00:28:26 2006
New Revision: 427033
URL: http://svn.apache.org/viewvc?rev=427033&view=rev
Log:
Fix macros
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml?rev=427033&r1=427032&r2=427033&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml Mon Jul 31 00:28:26 2006
@@ -27,7 +27,7 @@
-->
<jx:macro name="form" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
<jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$cocoon/parameters/locale)}"/>
- <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
+ <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters.getParameter('attribute-name', null))}"/>
<jx:if test="${cformsHelper.isVisible(form)}">
<jx:set var="cformsDummy" value="${cformsHelper.startForm(form, macro.arguments)}"/>
<!-- the form is also the current widget -->
@@ -42,7 +42,7 @@
-->
<jx:macro name="form-template" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
<jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$cocoon/parameters/locale)}"/>
- <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
+ <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters.getParameter('attribute-name', null))}"/>
<jx:if test="${cformsHelper.isVisible(form)}">
<jx:set var="cformsDummy" value="${cformsHelper.startForm(form, macro.arguments)}"/>
<!-- the form is also the current widget -->