Some tidy up in the generation of the new hybrid pseudo-Database authentication system.

This commit is contained in:
sb 2009-03-02 10:31:44 +00:00
parent 87a0f39b59
commit 87c7dc3f13
2 changed files with 20 additions and 28 deletions

View file

@ -8,8 +8,8 @@
Transform ADL into C# entity classes
$Author: sb $
$Revision: 1.17 $
$Date: 2009-02-06 12:08:28 $
$Revision: 1.18 $
$Date: 2009-03-02 10:31:44 $
-->
<!-- WARNING WARNING WARNING: Do NOT reformat this file!
@ -43,7 +43,7 @@
<!-- Whether to authenticate at application or at database layer.
If not 'Application', then 'Database'. -->
<xsl:param name="authentication-layer" select="Application"/>
<xsl:param name="authentication-layer" select="'Application'"/>
<!-- strings used in normalising names for constants.
NOTE NOTE NOTE:
@ -70,7 +70,7 @@
// (c)2007 Cygnet Solutions Ltd
//
// Automatically generated from application description using
// adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
// adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
//
// <xsl:value-of select="/adl:application/@revision"/>
//
@ -97,7 +97,7 @@
/// &lt;/summary&gt;
/// &lt;remarks&gt;
/// Automatically generated from description of group <xsl:value-of select="@name"/>
/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>.
/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>.
///
/// DO NOT EDIT THIS FILE!
/// &lt;/remarks&gt;
@ -123,7 +123,7 @@
// (c)2007 Cygnet Solutions Ltd
//
// Automatically generated from application description using
// adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
// adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
//
// <xsl:value-of select="/adl:application/@revision"/>
//
@ -149,7 +149,7 @@
/// &lt;/summary&gt;
/// &lt;remarks&gt;
/// Automatically generated from description of entity <xsl:value-of select="@name"/>
/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>.
/// using adl2entityclass.xsl revision <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>.
/// Note that manually maintained parts of this class may be defined in
/// a separate file called <xsl:value-of select="@name"/>.manual.cs, q.v.
///
@ -335,8 +335,6 @@
public override string NoDeleteReason {
get {
string result = null;
<xsl:choose>
<xsl:when test="$authentication-layer='Application'">
<xsl:if test="adl:property[@type='list']|adl:property[@type='link']">
StringBuilder bob = new StringBuilder();
<!-- TODO: we ought to start worrying about internationalisation NOW, not later! -->
@ -360,12 +358,6 @@
result = bob.ToString();
}
</xsl:if>
</xsl:when>
<xsl:when test="$authentication-layer='Database'">
/* unfortunately it's not currently possible to compute no-delete reasons
* on 'Database' authenticated applications */
</xsl:when>
</xsl:choose>
return result;
}
}

View file

@ -15,8 +15,8 @@
Transform ADL into velocity view templates
$Author: sb $
$Revision: 1.31 $
$Date: 2009-02-20 15:25:29 $
$Revision: 1.32 $
$Date: 2009-03-02 10:31:44 $
-->
<!-- WARNING WARNING WARNING: Do NOT reformat this file!
Whitespace (or lack of it) is significant! -->
@ -124,7 +124,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
</xsl:comment>
<xsl:call-template name="maybe-delete">
<xsl:with-param name="entity" select="."/>
@ -161,7 +161,7 @@
Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
<xsl:value-of select="/adl:application/@revision"/>
</xsl:comment>
@ -244,7 +244,7 @@
Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
Generation parameters were:
locale: <xsl:value-of select="$locale"/>
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"/>,
generated from ADL.
Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
Generation parameters were:
locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -914,7 +914,7 @@
Auto generated Velocity list for <xsl:value-of select="@name"/>,
generated from ADL.
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
Generation parameters were:
locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -977,7 +977,7 @@
Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
generated from ADL.
Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.31 $', 10)"/>
Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
Generation parameters were:
locale: <xsl:value-of select="$locale"/>
generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@ -1072,10 +1072,10 @@
<xsl:variable name="field" select="."/>
<th>
<xsl:call-template name="showprompt">
<xsl:with-param name="node" select="."/>
<xsl:with-param name="fallback" select="@property"/>
<xsl:with-param name="entity" select="$entity"/>
<xsl:with-param name="locale" select="$locale"/>
<xsl:with-param name="node" select="."/>
<xsl:with-param name="fallback" select="@property"/>
<xsl:with-param name="entity" select="$entity"/>
<xsl:with-param name="locale" select="$locale"/>
</xsl:call-template>
</th>
</xsl:for-each>
@ -1481,7 +1481,7 @@
<xsl:with-param name="instance" select="concat( 'instance.', $property/@name)"/>
</xsl:call-template>
</xsl:variable>
<xsl:value-of select="concat( '../../', $property/@entity, '/edit.rails', $keys)"/>
<xsl:value-of select="concat( '../', $property/@entity, '/edit.rails', $keys)"/>
</xsl:when>
</xsl:choose>
</xsl:variable>