[jboss-cvs] jboss-seam/src/main/org/jboss/seam/pages ...

[Gavin King]

  User: gavin   
  Date: 07/02/09 19:46:00

  Modified:    src/main/org/jboss/seam/pages  Page.java
  Log:
  JBSEAM-800
  
  Revision  Changes    Path
  1.10      +6 -4      jboss-seam/src/main/org/jboss/seam/pages/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Page.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Page.java	1 Feb 2007 12:33:47 -0000	1.9
  +++ Page.java	10 Feb 2007 00:46:00 -0000	1.10
  @@ -177,13 +177,15 @@
      {
         if ( isRestricted() )
         {
  -         String expr = restriction;
            // If no expression is configured, create a default one
  -         if (expr == null)
  +         if (restriction == null)
            {
  -            expr = String.format("#{s:hasPermission('%s', 'render', null)}", getViewId());
  +            Identity.instance().checkPermission( facesContext.getViewRoot().getViewId(), "render" );
  +         }
  +         else
  +         {
  +            Identity.instance().checkRestriction(restriction);
            }
  -         Identity.instance().checkRestriction(expr);
         }      
         
         boolean result = false;