svn commit: r652046 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl status.xml

[jo...@apache.org]

Author: joerg
Date: Sun Apr 27 19:53:51 2008
New Revision: 652046

URL: http://svn.apache.org/viewvc?rev=652046&view=rev
Log:
COCOON-1825: Forms: Fix @id handling on fi:group/fi:struct element in conjunction with AJAX requests.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?rev=652046&r1=652045&r2=652046&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl Sun Apr 27 19:53:51 2008
@@ -837,9 +837,16 @@
 
   <!--+
       | fi:struct - has no visual representation by default
+      | If the fi:struct contains an id and has only one child that is not in the fi: namespace,
+      | then copy the id to the child. This is needed for ajax when grouping is just used to group
+      | widgets.
       +-->
   <xsl:template match="fi:struct">
     <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="fi:struct[@id and count(*) = 1 and not(fi:*)]">
+    <xsl:apply-templates mode="copy-parent-id"/>
   </xsl:template>
 
   <!--+

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=652046&r1=652045&r2=652046&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sun Apr 27 19:53:51 2008
@@ -182,9 +182,12 @@
 
   <changes>
   <release version="2.1.12" date="TBD">
+    <action dev="JH" type="fix" fixes-bug="COCOON-1825" due-to="Vincent Demay" due-to-email="vincent@demay-fr.net">
+      Forms: Fix @id handling on fi:group/fi:struct element in conjunction with AJAX requests.
+    </action>
     <action dev="JH" type="fix" fixes-bug="COCOON-2192" due-to="Steven Dolg" due-to-email="steven.dolg@indoqa.com">
-        Core: Fix CachingOutputStream not caching all content or leading to ArrayIndexOutOfBoundsException when using
-        write(byte[], int, int).
+      Core: Fix CachingOutputStream not caching all content or leading to ArrayIndexOutOfBoundsException when using
+      write(byte[], int, int).
     </action>
     <action dev="JH" type="update" fixes-bug="COCOON-2168">
       Core: Set the default output buffer size of the pipeline to 1,048,576 (1 MB) rather than -1 (complete buffering)