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

bug 2899 : This came down to two issues; one, a (new) bug in the shuffle widget code prevented the client-side validation working on new records; second, the specification for an email address was incorrect (it didn't allow a period before the '@', e.g. 'mike.oreilly@sru.org.uk'. Fixed

Browse source 
status 2899: resolved FIXED
This commit is contained in:
sb 2009-05-04 13:53:18 +00:00
parent 328e2606d2
commit 961e71e57a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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.50 $ $Revision: 1.51 $
$Date: 2009-05-04 11:00:05 $ $Date: 2009-05-04 13:53:18 $
--> -->
<!-- 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! -->
@ -1449,19 +1449,23 @@
function performInitialisation() function performInitialisation()
{ {
#if ( $instance)
#if ( ! $instance.IsNew)
<xsl:for-each select="$form/ancestor::adl:entity/adl:property[@type='link']"> <xsl:for-each select="$form/ancestor::adl:entity/adl:property[@type='link']">
<xsl:variable name="propname" select="@name"/> <xsl:variable name="propname" select="@name"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$form/@properties='all'"> <xsl:when test="$form/@properties='all'">
document.<xsl:value-of select="$form/@name"/>.<xsl:value-of select="@name"/>.submitHandler = shuffleSubmitHandler; <xsl:value-of select="concat( 'document.',$form/@name, '.', @name, '.submitHandler = shuffleSubmitHandler;')"/>
</xsl:when> </xsl:when>
<xsl:when test="$form//adl:field[@property=$propname]"> <xsl:when test="$form//adl:field[@property=$propname]">
document.<xsl:value-of select="$form/@name"/>.<xsl:value-of select="@name"/>.submitHandler = shuffleSubmitHandler; <xsl:value-of select="concat( 'document.',$form/@name, '.', @name, '.submitHandler = shuffleSubmitHandler;')"/>
</xsl:when> </xsl:when>
<!-- if we're not doing all properties, and if this property is not the property of a field, <!-- if we're not doing all properties, and if this property is not the property of a field,
we /don't/ set up a submit handler. --> we /don't/ set up a submit handler. -->
</xsl:choose> </xsl:choose>
</xsl:for-each> </xsl:for-each>
#end
#end
var validator = new Validation('<xsl:value-of select="$form/@name"/>', {immediate : true, useTitles : true}); var validator = new Validation('<xsl:value-of select="$form/@name"/>', {immediate : true, useTitles : true});
} }
@ -1766,7 +1770,7 @@
Auto generated Velocity macro for <xsl:value-of select="@name"/>, Auto generated Velocity macro for <xsl:value-of select="@name"/>,
generated from ADL. generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.50 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.51 $', 10)"/>
Generation parameters were: Generation parameters were:
area-name: <xsl:value-of select="$area-name"/> area-name: <xsl:value-of select="$area-name"/>
default-url: <xsl:value-of select="$default-url"/> default-url: <xsl:value-of select="$default-url"/>