From 2bd5c55412a619684a0ad8f37a74f3e5b0ed19fe Mon Sep 17 00:00:00 2001
From: sb <sb>
Date: Wed, 6 May 2009 18:02:35 +0000
Subject: [PATCH] bug 2913 : Sort of fixed. At least, I've fixed the wrong bit
 - the button on the form is now no longer there, but the link still reads
 'edit'. However, this is a whole lot better.

---
 transforms/adl2views.xslt           | 34 ++++++++++++++++++++++-------
 transforms/permissions-include.xslt | 30 +++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/transforms/adl2views.xslt b/transforms/adl2views.xslt
index 0aae075..bb85074 100755
--- a/transforms/adl2views.xslt
+++ b/transforms/adl2views.xslt
@@ -15,8 +15,8 @@
     Transform ADL into velocity view templates
     
     $Author: sb $
-    $Revision: 1.55 $
-    $Date: 2009-05-06 17:25:55 $
+    $Revision: 1.56 $
+    $Date: 2009-05-06 18:02:35 $
 	-->
 	<!-- WARNING WARNING WARNING: Do NOT reformat this file! 
 		Whitespace (or lack of it) is significant! -->
@@ -442,12 +442,30 @@
                     <xsl:with-param name="entity" select="$form/ancestor::adl:entity"/>
                   </xsl:call-template>
                 </xsl:variable>
-                <!-- NOTE! NOTE! NOTE! Whitespace is significant - any linefeeds inside the #if ( ) clause
+				  <xsl:variable name="updategroups">
+					  <xsl:call-template name="entity-update-groups">
+						  <xsl:with-param name="entity" select="$form/ancestor::adl:entity"/>
+					  </xsl:call-template>
+				  </xsl:variable>
+				  <!-- NOTE! NOTE! NOTE! Whitespace is significant - any linefeeds inside the #if ( ) clause
 								cause the Velocity parser to break! -->
-                #if ( <xsl:for-each select="exsl:node-set( $savegroups)/*"> ${SecurityHelper.InGroup( "<xsl:value-of select="./@name"/>")} ||</xsl:for-each> false)
-                <xsl:call-template name="save-widget-row"/>
-                #end
-                <xsl:variable name="deletegroups">
+				#if ( $instance)
+				  #if ( $instance.IsNew)
+				    #if ( <xsl:for-each select="exsl:node-set( $savegroups)/*"> ${SecurityHelper.InGroup( "<xsl:value-of select="./@name"/>")} ||</xsl:for-each> false)
+                    <xsl:call-template name="save-widget-row"/>
+				    #end
+				  #else
+				    #if ( <xsl:for-each select="exsl:node-set( $updategroups)/*"> ${SecurityHelper.InGroup( "<xsl:value-of select="./@name"/>")} || </xsl:for-each> false)
+				    <xsl:call-template name="save-widget-row"/>
+				    #end
+				  #end
+				#else
+				<!-- for application-layer authentication, we may not actually have an instance at this stage -->
+				  #if ( <xsl:for-each select="exsl:node-set( $savegroups)/*"> ${SecurityHelper.InGroup( "<xsl:value-of select="./@name"/>")} || </xsl:for-each> false)
+				  <xsl:call-template name="save-widget-row"/>
+				  #end
+				#end
+				  <xsl:variable name="deletegroups">
                   <xsl:call-template name="entity-delete-groups">
                     <xsl:with-param name="entity" select="$form/ancestor::adl:entity"/>
                   </xsl:call-template>
@@ -1789,7 +1807,7 @@
       Auto generated Velocity macro for <xsl:value-of select="@name"/>,
       generated from ADL.
 
-      Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.55 $', 10)"/>
+      Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.56 $', 10)"/>
       Generation parameters were:
       area-name: <xsl:value-of select="$area-name"/>
       default-url: <xsl:value-of select="$default-url"/>
diff --git a/transforms/permissions-include.xslt b/transforms/permissions-include.xslt
index 7b8fd97..3205222 100755
--- a/transforms/permissions-include.xslt
+++ b/transforms/permissions-include.xslt
@@ -15,8 +15,8 @@
     Utility templates to find permissions on various things
     
     $Author: sb $
-    $Revision: 1.4 $
-    $Date: 2009-04-30 08:56:33 $
+    $Revision: 1.5 $
+    $Date: 2009-05-06 18:02:35 $
 	-->
 
 	<!-- collect all groups which can edit the specified property -->
@@ -166,6 +166,32 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<!-- collect the groups which can save an entity -->
+	<xsl:template name="entity-update-groups">
+		<xsl:param name="entity"/>
+		<xsl:for-each select="//adl:group">
+			<xsl:variable name="groupname" select="@name"/>
+			<xsl:variable name="perm">
+				<xsl:choose>
+					<xsl:when test="$entity/adl:permission[@group=$groupname]">
+						<xsl:value-of select="$entity/adl:permission[@group=$groupname]/@permission"/>
+					</xsl:when>
+					<xsl:otherwise>none</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="$perm='all'">
+					<xsl:copy-of select="."/>
+				</xsl:when>
+				<xsl:when test="$perm='edit'">
+					<xsl:copy-of select="."/>
+				</xsl:when>
+				<xsl:otherwise/>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
+
 	<!-- collect the groups which can delete an entity -->
 	<xsl:template name="entity-delete-groups">
 		<xsl:param name="entity"/>