You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/12/08 14:15:00 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/content/info access-control.xsp

andreas     2003/12/08 05:15:00

  Modified:    src/webapp/lenya/xslt/info info.xsl
               src/webapp/lenya/content/info access-control.xsp
  Log:
  checking if visitor role exists
  
  Revision  Changes    Path
  1.49      +32 -24    cocoon-lenya/src/webapp/lenya/xslt/info/info.xsl
  
  Index: info.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/info.xsl,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- info.xsl	25 Nov 2003 10:01:25 -0000	1.48
  +++ info.xsl	8 Dec 2003 13:15:00 -0000	1.49
  @@ -322,29 +322,37 @@
   	<xsl:param name="area"/>
   	<xsl:param name="type"/>
   	<xsl:param name="title"/>
  -	<form method="get">
  -	<input type="hidden" name="lenya.usecase" value="info-ac-{$area}"/>
  -	<input type="hidden" name="lenya.step" value="showscreen"/>
  -	<td><xsl:value-of select="$title"/>:</td>
  -	<td><xsl:apply-templates select="//lenya-info:items[@type = $type]"/></td>
  -	<td>
  -		<xsl:choose>
  -			<xsl:when test="$area = 'authoring'">
  -				<xsl:apply-templates select="//lenya-info:items[@type = 'role']"/>
  -			</xsl:when>
  -			<xsl:otherwise>
  -				<input type="hidden" name="role_id" value="visit"/>
  -			</xsl:otherwise>
  -		</xsl:choose>
  -	</td>
  -	<td>
  -		<input type="submit" name="add_credential_{$type}" value="Add">
  -			<xsl:if test="not(//lenya-info:items[@type = $type]/lenya-info:item)">
  -				<xsl:attribute name="disabled">disabled</xsl:attribute>
  -			</xsl:if>
  -		</input>
  -	</td>
  -	</form>
  +	<xsl:variable name="visitor-role" select="//lenya-info:visitor-role"/>
  +	<xsl:choose>
  +  	<xsl:when test="$visitor-role">
  +    	<form method="get">
  +    	<input type="hidden" name="lenya.usecase" value="info-ac-{$area}"/>
  +    	<input type="hidden" name="lenya.step" value="showscreen"/>
  +    	<td><xsl:value-of select="$title"/>:</td>
  +    	<td><xsl:apply-templates select="//lenya-info:items[@type = $type]"/></td>
  +    	<td>
  +    		<xsl:choose>
  +    			<xsl:when test="$area = 'authoring'">
  +    				<xsl:apply-templates select="//lenya-info:items[@type = 'role']"/>
  +    			</xsl:when>
  +    			<xsl:otherwise>
  +    				<input type="hidden" name="role_id" value="{//lenya-info:visitor-role}"/>
  +    			</xsl:otherwise>
  +    		</xsl:choose>
  +    	</td>
  +    	<td>
  +    		<input type="submit" name="add_credential_{$type}" value="Add">
  +    			<xsl:if test="not(//lenya-info:items[@type = $type]/lenya-info:item)">
  +    				<xsl:attribute name="disabled">disabled</xsl:attribute>
  +    			</xsl:if>
  +    		</input>
  +    	</td>
  +    	</form>
  +  	</xsl:when>
  +  	<xsl:otherwise>
  +  	  No visitor role found which can be assigned in the live area.
  +  	</xsl:otherwise>
  +	</xsl:choose>
   </xsl:template>
   
   
  
  
  
  1.4       +13 -2     cocoon-lenya/src/webapp/lenya/content/info/access-control.xsp
  
  Index: access-control.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/access-control.xsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- access-control.xsp	13 Nov 2003 17:06:39 -0000	1.3
  +++ access-control.xsp	8 Dec 2003 13:15:00 -0000	1.4
  @@ -36,6 +36,19 @@
   <lenya-info:info>
      
       <xsp:logic>
  +      
  +      RoleManager roleManager = (RoleManager) <input:get-attribute module="access-control" name="role-manager" as="object"/>;
  +      
  +      Role[] roles = roleManager.getRoles();
  +      String visitorRole = "";
  +      for (int i = 0; i &lt; roles.length; i++) {
  +          if (roles[i].getId().equals("visitor") || roles[i].getId().equals("visit")) {
  +              visitorRole = roles[i].getId();
  +          }
  +      }
  +      
  +      <li:visitor-role><xsp:expr>visitorRole</xsp:expr></li:visitor-role>
  +      
         String area = parameters.getParameter("area", null);
   			PolicyHelper helper = new PolicyHelper();
   			helper.setup(objectModel, this.manager, area);
  @@ -87,8 +100,6 @@
   								    }
   								}
   								
  -								RoleManager roleManager = (RoleManager)
  -										<input:get-attribute module="access-control" name="role-manager" as="object"/>;
   								Role role = roleManager.getRole(roleId);
   								
   								if (role == null) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org