From 7b1f458583a88c3ffbc45c25a12d76e25610863c Mon Sep 17 00:00:00 2001
From: sb <sb>
Date: Tue, 13 May 2008 10:36:46 +0000
Subject: [PATCH] bug 1902: template formmenus did not correctly generate menus
 for entities on form fields, because of a missing namespace qualifier.

---
 transforms01/adl2controllerclasses.xslt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/transforms01/adl2controllerclasses.xslt b/transforms01/adl2controllerclasses.xslt
index e055989..ba79c6d 100755
--- a/transforms01/adl2controllerclasses.xslt
+++ b/transforms01/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.24 $
-    $Date: 2008-05-09 16:12:12 $
+    $Revision: 1.25 $
+    $Date: 2008-05-13 10:36:46 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -71,7 +71,7 @@
 //
 //  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 //  Automatically generated from application description using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.24 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.25 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -128,7 +128,7 @@ namespace <xsl:value-of select="$controllerns"/> {
 //
 //  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 //  Automatically generated from application description using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.24 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.25 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -873,6 +873,7 @@ namespace <xsl:value-of select="$controllerns"/> {
 	<!-- produce all menus for a given form: harder, but more efficient -->
 	<xsl:template name="formmenus">
 		<xsl:param name="form"/>
+			/* set up menus for the form, if required */
 		<xsl:choose>
 			<xsl:when test="$form/@properties = 'all'">
 				<xsl:call-template name="entitymenus">
@@ -880,23 +881,23 @@ namespace <xsl:value-of select="$controllerns"/> {
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:for-each select="$form//field">
+				<xsl:for-each select="$form//adl:field">
 					<xsl:variable name="propname" select="@property"/>
 					<xsl:choose>
 						<xsl:when test="$form/ancestor::adl:entity/adl:property[@name=$propname and @type='entity']">
-							/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the select for <xsl:value-of select="@name"/> */
+			/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the select for <xsl:value-of select="$propname"/> */
 							<xsl:call-template name="menu">
 								<xsl:with-param name="property" select="$form/ancestor::adl:entity/adl:property[@name=$propname]"/>
 							</xsl:call-template>
 						</xsl:when>
 						<xsl:when test="$form/ancestor::adl:entity/adl:property[@name=$propname and @type='link']">
-							/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the LHS of the shuffle for <xsl:value-of select="@name"/> */
+			/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the LHS of the shuffle for <xsl:value-of select="$propname"/> */
 							<xsl:call-template name="menu">
 								<xsl:with-param name="property" select="$form/ancestor::adl:entity/adl:property[@name=$propname]"/>
 							</xsl:call-template>
 						</xsl:when>
 						<xsl:when test="$form/ancestor::adl:entity/adl:property[@name=$propname and @type='list']">
-							/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the multi-select for <xsl:value-of select="@name"/> */
+			/* produce a list of <xsl:value-of select="$form/ancestor::adl:entity/adl:property[@name=$propname]/@entity"/> to populate the multi-select for <xsl:value-of select="@name"/> */
 							<xsl:call-template name="menu">
 								<xsl:with-param name="property" select="$form/ancestor::adl:entity/adl:property[@name=$propname]"/>
 							</xsl:call-template>