Changeset 12909

Timestamp:

02/28/09 11:55:26 (3 years ago)

Author:

sys

Message:

compoPrim build xed : pas de bind elementSubtree si widget hidden

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/compositionPrim/form.xed.xml.xsl (modified) (1 diff)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/compositionPrim/form.xed.xml.xsl

@@ -173 +173 @@
                 <xsl:if test="$vPublicSgn != '' or $vCountInternalizable!='' or count(sm:allowedModel)=0" >
                         <!-- count(sm:allowedModel)=0 :: la part est concue pour ne porter que des meta, il ne faut donc pas le virer ! -->
-                        <xsl:variable name="vDisplayMode" select="$vFormParams/*/@displayMode"/>
-                        
-                        <element se:bind="{si(not($vFormParams/sm:hiddenWidget) and not($vDisplayMode) or $vDisplayMode='auto', 'elementSubtree', si( $vDisplayMode='closedByDefault' or $vFormParams/sm:hiddenWidget[@hideChildren='yes'], 'subtree', 'elementSubtree'))}" se:name="sp:{@code}" se:title="{@name}">
+                        <xsl:variable name="vDisplayMode" select="returnFirst($vFormParams/*/@displayMode, 'auto')"/>
+                        <xsl:variable name="vPartBind">
+                                <xsl:choose>
+                                        <xsl:when test="$vFormParams/sm:hiddenWidget[@hideChildren='yes']">subtree</xsl:when>
+                                        <xsl:when test="$vFormParams/sm:hiddenWidget[@hideChildren='no']">element</xsl:when>
+                                        <xsl:when test="$vDisplayMode='auto'">elementSubtree</xsl:when>
+                                        <xsl:when test="$vDisplayMode='closedByDefault'">subtree</xsl:when>
+                                        <xsl:otherwise>elementSubtree</xsl:otherwise>
+                                </xsl:choose>
+                        </xsl:variable>
+                        <element se:bind="{$vPartBind}" se:name="sp:{@code}" se:title="{@name}">
                                 <xsl:if test="@usage='optional'"><xsl:attribute name="se:card">?</xsl:attribute></xsl:if>
                                 <xsl:if test="sm:meta or sm:metaIfExternalized or $vCountInternalizable"><xsl:attribute name="abstractXsl"><xsl:value-of select="resultatAgent('//xslTitlesPage', 'act:')"/></xsl:attribute></xsl:if>