You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/08/10 19:04:32 UTC
svn commit: r430438 -
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
Author: antonio
Date: Thu Aug 10 10:04:32 2006
New Revision: 430438
URL: http://svn.apache.org/viewvc?rev=430438&view=rev
Log:
COCOON-1758: Fixing my bad committed patch for solving this issue. I forgot to revert some test changes. Thanks to Simone Gianni for discovering the error.
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=430438&r1=430437&r2=430438&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 Thu Aug 10 10:04:32 2006
@@ -27,7 +27,7 @@
ft:form
-->
<jx:macro name="form" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
- <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale')}"/>
+ <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale','')}"/>
<jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$localeSitemapParameter)}"/>
<jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
<jx:if test="${cformsHelper.isVisible(form)}">
@@ -43,7 +43,7 @@
ft:form-template: preferred syntax is now "ft:form" (we know we're in a template)
-->
<jx:macro name="form-template" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
- <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale')}"/>
+ <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale', '')}"/>
<jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$localeSitemapParameter)}"/>
<jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
<jx:if test="${cformsHelper.isVisible(form)}">