'svn commit: r652048 - in'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xml-cocoon-cvs
Subject:    svn commit: r652048 - in
From:       joerg () apache ! org
Date:       2008-04-28 2:56:57
Message-ID: 20080428025657.996D91A981C () eris ! apache ! org
[Download RAW message or body]

Author: joerg
Date: Sun Apr 27 19:56:54 2008
New Revision: 652048

URL: http://svn.apache.org/viewvc?rev=652048&view=rev
Log:
COCOON-1825: Fix @id handling on fi:group/fi:struct 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=652048&r1=652047&r2=652048&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 19:56:54 2008 @@ -25,8 +25,11 @@
 <document>
   <body>
     <release version="1.1.1" date="TBD" description="unreleased">
+      <action dev="joerg" type="fix" fixes-bug="COCOON-1825" due-to="Vincent Demay" \
due-to-email="vincent@demay-fr.net"> +        Fix @id handling on fi:group/fi:struct \
element in conjunction with AJAX requests. +      </action>
       <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.
+        Fix @id handling on fi:group element in conjunction with AJAX requests.
       </action>
     </release>
     <release version="1.1.0" date="2008-??-??" description="released">

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/s \
rc/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?rev=652048&r1=652047&r2=652048&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 19:56:54 2008 @@ -687,9 +687,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>
 
   <!--+


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic