You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2008/04/28 01:51:16 UTC
svn commit: r652029 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src: changes/changes.xml
main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Author: joerg
Date: Sun Apr 27 16:51:13 2008
New Revision: 652029
URL: http://svn.apache.org/viewvc?rev=652029&view=rev
Log:
COCOON-2204: Fix @id handling on ft:group element in conjunction with AJAX requests.
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml?rev=652029&r1=652028&r2=652029&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml Sun Apr 27 16:51:13 2008
@@ -24,7 +24,12 @@
-->
<document>
<body>
- <release version="1.1.0-M1" date="2008-??-??" description="unreleased">
+ <release version="1.1.1" date="TBD" description="unreleased">
+ <action dev="joerg" type="fix" fixes-bug="COCOON-2204" due-to="Kamal Bhatt" due-to-email="bhatt@tt.com.au">
+ Fix @id handling on ft:group element in conjunction with AJAX requests.
+ </action>
+ </release>
+ <release version="1.1.0" date="2008-??-??" description="released">
<action dev="giacomo" type="update">
The Cocoon Forms springified (as much as possible).
</action>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?rev=652029&r1=652028&r2=652029&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl Sun Apr 27 16:51:13 2008
@@ -698,15 +698,15 @@
| then copy the id to the child. This is needed for ajax when grouping is just used to group
| widgets.
+-->
- <xsl:template match="fi:group[@id and count(*) = 1 and not(fi:*)]">
- <xsl:apply-templates mode="copy-parent-id"/>
- </xsl:template>
-
<xsl:template match="fi:group">
<xsl:apply-templates/>
</xsl:template>
- <xsl:template match="fi:group" mode="copy-parent-id">
+ <xsl:template match="fi:group[@id and count(*) = 1 and not(fi:*)]">
+ <xsl:apply-templates mode="copy-parent-id"/>
+ </xsl:template>
+
+ <xsl:template match="*" mode="copy-parent-id">
<xsl:copy>
<xsl:attribute name="id"><xsl:value-of select="../@id"/></xsl:attribute>
<xsl:copy-of select="@*"/>