Show
Ignore:
Timestamp:
09/04/10 22:05:44 (21 months ago)
Author:
ffray
Message:

Added navigateTo-elements to auth-constraints allowing to create
conditional navigation-cases.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/release-0.13.x/pfixcore/src/de/schlund/pfixcore/workflow/context/RequestContextImpl.java

    r5138 r5341  
    374374                authConst = getParentContext().getContextConfig().getDefaultAuthConstraint(); 
    375375            if (authConst != null) { 
    376                 String authPageName = authConst.getAuthPage(); 
     376                String authPageName = authConst.getAuthPage(parentcontext); 
    377377                if (authPageName != null) { 
    378378                    currentpagerequest = createPageRequest(authPageName); 
    … …  
    742742            AuthConstraint authConstraint = pageConfig.getAuthConstraint(); 
    743743            if (authConstraint == null) authConstraint = parentcontext.getContextConfig().getDefaultAuthConstraint(); 
    744             if (authConstraint != null && !authConstraint.isAuthorized(parentcontext) && authConstraint.getAuthPage()==null) return false; 
     744            if (authConstraint != null && !authConstraint.isAuthorized(parentcontext) && authConstraint.getAuthPage(parentcontext)==null) return false; 
    745745        } 
    746746        return true; 
    … …  
    771771                authConstraint = parentcontext.getContextConfig().getDefaultAuthConstraint(); 
    772772            if (authConstraint != null) { 
    773                 String authPageName = authConstraint.getAuthPage(); 
     773                String authPageName = authConstraint.getAuthPage(parentcontext); 
    774774                if (authPageName != null) 
    775775                    localAuthPage = createPageRequest(authPageName);