[Bedework-commit] bedework r2065 - in releases/bedework-3.4.1.1/deployment: webadmin/webapp/resources/default/default webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2009-02-12 17:47:09 -0500 (Thu, 12 Feb 2009)
New Revision: 2065

Modified:
   releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
   releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
update display of access names to account for xml correction

Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2009-02-12 18:29:12 UTC (rev 2064)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2009-02-12 22:47:09 UTC (rev 2065)
@@ -4350,7 +4350,7 @@
             <xsl:if test="grant">
               grant:
               <span class="grant">
-                <xsl:for-each select="grant/*">
+                <xsl:for-each select="grant/privilege/*">
                   <xsl:value-of select="name(.)"/>
                   <xsl:if test="position() != last()">, </xsl:if>
                 </xsl:for-each>
@@ -4359,7 +4359,7 @@
             <xsl:if test="deny">
               deny:
               <span class="deny">
-                <xsl:for-each select="deny/*">
+                <xsl:for-each select="deny/privilege/*">
                   <xsl:value-of select="name(.)"/>
                   <xsl:if test="position() != last()">, </xsl:if>
                 </xsl:for-each>

Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2009-02-12 18:29:12 UTC (rev 2064)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2009-02-12 22:47:09 UTC (rev 2065)
@@ -7690,7 +7690,7 @@
               <xsl:if test="grant">
                 grant:
                 <span class="grant">
-                  <xsl:for-each select="grant/*">
+                  <xsl:for-each select="grant/privilege/*">
                     <xsl:value-of select="name(.)"/>
                     <xsl:if test="position() != last()">, </xsl:if>
                   </xsl:for-each>
@@ -7699,7 +7699,7 @@
               <xsl:if test="deny">
                 deny:
                 <span class="deny">
-                  <xsl:for-each select="deny/*">
+                  <xsl:for-each select="deny/privilege/*">
                     <xsl:value-of select="name(.)"/>
                     <xsl:if test="position() != last()">, </xsl:if>
                   </xsl:for-each>
@@ -8015,10 +8015,10 @@
  --></xsl:variable><!--
  --><xsl:variable name="aclString"><!--
    --><xsl:if test="grant"><!--
-     --><xsl:for-each select="grant/*"><xsl:call-template name="grantDenyToInternal"><xsl:with-param name="name"><xsl:value-of select="name(.)"/></xsl:with-param></xsl:call-template></xsl:for-each><!--
+     --><xsl:for-each select="grant/privilege/*"><xsl:call-template name="grantDenyToInternal"><xsl:with-param name="name"><xsl:value-of select="name(.)"/></xsl:with-param></xsl:call-template></xsl:for-each><!--
    --></xsl:if><!--
    --><xsl:if test="deny"><!--
-     --><xsl:for-each select="deny/*">-<xsl:call-template name="grantDenyToInternal"><xsl:with-param name="name"><xsl:value-of select="name(.)"/></xsl:with-param></xsl:call-template></xsl:for-each><!--
+     --><xsl:for-each select="deny/privilege/*">-<xsl:call-template name="grantDenyToInternal"><xsl:with-param name="name"><xsl:value-of select="name(.)"/></xsl:with-param></xsl:call-template></xsl:for-each><!--
    --></xsl:if><!--
  --></xsl:variable><!--
  --><xsl:variable name="inherited"><!--