simon/adl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bug 2682: when outputting fields with options in tables, show the prompt rather than the value where possible

Browse source 
status 2682: resolved FIXED
This commit is contained in:
sb 2009-03-05 13:12:19 +00:00
parent 6ca0ca9c3d
commit 51fecdad0f
1 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
transforms/adl2views.xslt
View file

@ -15,8 +15,8 @@
Transform ADL into velocity view templates Transform ADL into velocity view templates
$Author: sb $ $Author: sb $
$Revision: 1.33 $ $Revision: 1.34 $
$Date: 2009-03-05 10:59:39 $ $Date: 2009-03-05 13:12:19 $
--> -->
<!-- WARNING WARNING WARNING: Do NOT reformat this file! <!-- WARNING WARNING WARNING: Do NOT reformat this file!
Whitespace (or lack of it) is significant! --> Whitespace (or lack of it) is significant! -->
@ -124,7 +124,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>, Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
</xsl:comment> </xsl:comment>
<xsl:call-template name="maybe-delete"> <xsl:call-template name="maybe-delete">
<xsl:with-param name="entity" select="."/> <xsl:with-param name="entity" select="."/>
@ -161,7 +161,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>, Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
<xsl:value-of select="/adl:application/@revision"/> <xsl:value-of select="/adl:application/@revision"/>
</xsl:comment> </xsl:comment>
@ -244,7 +244,7 @@
Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
Generation parameters were: Generation parameters were:
locale: <xsl:value-of select="$locale"/> locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/> generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -320,7 +320,7 @@
Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
Generation parameters were: Generation parameters were:
locale: <xsl:value-of select="$locale"/> locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/> generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -617,6 +617,8 @@
<xsl:otherwise>actionSafe</xsl:otherwise> <xsl:otherwise>actionSafe</xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<!-- don't emit a verb unless there is an instance for it to act on -->
#if( $instance)
<tr> <tr>
<xsl:attribute name="class"> <xsl:attribute name="class">
<xsl:value-of select="$class"/> <xsl:value-of select="$class"/>
@ -642,6 +644,7 @@
</button> </button>
</td> </td>
</tr> </tr>
#end
</xsl:template> </xsl:template>
<xsl:template match="adl:field"> <xsl:template match="adl:field">
@ -914,7 +917,7 @@
Auto generated Velocity list for <xsl:value-of select="@name"/>, Auto generated Velocity list for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
Generation parameters were: Generation parameters were:
locale: <xsl:value-of select="$locale"/> locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/> generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -977,7 +980,7 @@
Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>, Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL. generated from ADL.
Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/> Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.34 $', 10)"/>
Generation parameters were: Generation parameters were:
locale: <xsl:value-of select="$locale"/> locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/> generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -1272,6 +1275,9 @@
</xsl:if> </xsl:if>
</td> </td>
</xsl:for-each> </xsl:for-each>
<td>
<input type="submit" value="Search!"/>
</td>
</tr> </tr>
</xsl:if> </xsl:if>
#foreach( <xsl:value-of select="concat( '$', $entity/@name)"/> in <xsl:value-of select="concat('$', $instance-list)"/>) #foreach( <xsl:value-of select="concat( '$', $entity/@name)"/> in <xsl:value-of select="concat('$', $instance-list)"/>)
@ -1381,6 +1387,31 @@
<xsl:param name="property"/> <xsl:param name="property"/>
<xsl:param name="objectvar" select="instance"/> <xsl:param name="objectvar" select="instance"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$property/adl:option">
<xsl:for-each select="$property/adl:option">
<xsl:variable name="val">
<xsl:variable name="base-type">
<xsl:call-template name="base-type">
<xsl:with-param name="property" select="$property"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose>
<xsl:when test="$base-type = 'string'">
<xsl:value-of select="concat( '&#34;', @value, '&#34;')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@value"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
#if( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/> == <xsl:value-of select="$val"/>)
<xsl:call-template name="showprompt">
<xsl:with-param name="node" select="."/>
<xsl:with-param name="fallback" select="@value"/>
</xsl:call-template>
#end
</xsl:for-each>
</xsl:when>
<xsl:when test="$property/@type = 'date'"> <xsl:when test="$property/@type = 'date'">
#if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>) #if ( <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>)
<xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>.ToString( 'd') <xsl:value-of select="concat( '$', $entity/@name, '.', $property/@name)"/>.ToString( 'd')