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

bug 2838 : Belts and braces - if no valid session, blank the page content. This in addition to changes in C1873-SRU-Hospitality.adl.xml which generates a JavaScript forced redirect.

Browse source 
status 2838: resolved FIXED
This commit is contained in:
sb 2009-05-01 08:46:45 +00:00
parent bd2690ecdd
commit 82a01ce516
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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.41 $ $Revision: 1.42 $
$Date: 2009-04-30 17:04:00 $ $Date: 2009-05-01 08:46:45 $
--> -->
<!-- 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! -->
@ -1753,7 +1753,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.41 $', 10)"/> Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.42 $', 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"/>
@ -1801,6 +1801,10 @@
</xsl:for-each> </xsl:for-each>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:if test="$authentication-layer = 'Database'">
#if ( ${SecurityHelper.GetUserName()})
<!-- the #else and #end of this #if is generated in the foot template -->
</xsl:if>
<xsl:variable name="current-entity" select="ancestor::adl:entity/@name"/> <xsl:variable name="current-entity" select="ancestor::adl:entity/@name"/>
<xsl:if test="$generate-site-navigation = 'true'"> <xsl:if test="$generate-site-navigation = 'true'">
<ul class="generatednav"> <ul class="generatednav">
@ -1857,6 +1861,16 @@
<!-- standard footer on all pages; product identifier and version --> <!-- standard footer on all pages; product identifier and version -->
<xsl:template name="foot"> <xsl:template name="foot">
<xsl:if test="$authentication-layer = 'Database'">
<!-- the #if for this #else and #end is generated in the head template -->
#else
<div class="content">
<p>
To view this page you must first <a href="../dblogin/login.rails">Log in</a>
</p>
</div>
#end
</xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test="adl:foot"> <xsl:when test="adl:foot">
<xsl:for-each select="adl:foot/*"> <xsl:for-each select="adl:foot/*">