Changeset 1987

Show
Ignore:
Timestamp:
12/17/08 14:45:10
Author:
johnsa
Message:

update xpath expressions to select grant/deny with new privilege node

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1979 r1987  
    36173617              </th> 
    36183618              <td> 
    3619                 <xsl:for-each select="grant/node()"> 
     3619                <xsl:for-each select="grant/privilege/node()"> 
    36203620                  <xsl:value-of select="name(.)"/>&#160;&#160; 
    36213621                </xsl:for-each> 
    3622                 <xsl:for-each select="deny/node()"> 
     3622                <xsl:for-each select="deny/privilege/node()"> 
    36233623                  <xsl:choose> 
    36243624                    <xsl:when test="name(.)='all'"> 
     
    44194419              grant: 
    44204420              <span class="grant"> 
    4421                 <xsl:for-each select="grant/*"> 
     4421                <xsl:for-each select="grant/privilege/*"> 
    44224422                  <xsl:value-of select="name(.)"/> 
    44234423                  <xsl:if test="position() != last()">, </xsl:if> 
     
    44284428              deny: 
    44294429              <span class="deny"> 
    4430                 <xsl:for-each select="deny/*"> 
     4430                <xsl:for-each select="deny/privilege/*"> 
    44314431                  <xsl:value-of select="name(.)"/> 
    44324432                  <xsl:if test="position() != last()">, </xsl:if> 
     
    54765476              </th> 
    54775477              <td> 
    5478                 <xsl:for-each select="grant/node()"> 
     5478                <xsl:for-each select="grant/privilege/node()"> 
    54795479                  <xsl:value-of select="name(.)"/>&#160;&#160; 
    54805480                </xsl:for-each> 
    5481                 <xsl:for-each select="deny/node()"> 
     5481                <xsl:for-each select="deny/privilege/node()"> 
    54825482                  <xsl:choose> 
    54835483                    <xsl:when test="name(.)='all'"> 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1986 r1987  
    79697969                grant: 
    79707970                <span class="grant"> 
    7971                   <xsl:for-each select="grant/*"> 
     7971                  <xsl:for-each select="grant/privilege/*"> 
    79727972                    <xsl:value-of select="name(.)"/> 
    79737973                    <xsl:if test="position() != last()">, </xsl:if> 
     
    79787978                deny: 
    79797979                <span class="deny"> 
    7980                   <xsl:for-each select="deny/*"> 
     7980                  <xsl:for-each select="deny/privilege/*"> 
    79817981                    <xsl:value-of select="name(.)"/> 
    79827982                    <xsl:if test="position() != last()">, </xsl:if> 
     
    82948294 --><xsl:variable name="aclString"><!-- 
    82958295   --><xsl:if test="grant"><!-- 
    8296      --><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><!-- 
     8296     --><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><!-- 
    82978297   --></xsl:if><!-- 
    82988298   --><xsl:if test="deny"><!-- 
    8299      --><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><!-- 
     8299     --><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><!-- 
    83008300   --></xsl:if><!-- 
    83018301 --></xsl:variable><!--