Author: billyxie
Date: 2010-01-08 08:44:40 +0100 (Fri, 08 Jan 2010)
New Revision: 40416

Modified:
   
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
Log:
CMSC-1603 - add the PageReadable Tag

Modified: 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
  2010-01-08 07:15:25 UTC (rev 40415)
+++ 
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
  2010-01-08 07:44:40 UTC (rev 40416)
@@ -32,17 +32,17 @@
    @Override
    public int doStartTag() throws JspException {
       super.doStartTag();
-      AuthorityService authorityService = (AuthorityService) 
ApplicationContextFactory.getBean("authorityService");   
-      org.acegisecurity.Authentication authentication = 
SecurityContextHolder.getContext().getAuthentication();
-      if(authentication == null) return SKIP_BODY;
-      Set<String> authorityNames = 
authorityService.getAuthorityNamesForUser(authentication.getName());
-      
       Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
       Node pageNode = cloud.getNode(getPageId());
       NodeList pagegroups = pageNode.getRelatedNodes("pagegroup");
       
       if(pagegroups.size() == 0) return EVAL_BODY_INCLUDE;;
       
+      AuthorityService authorityService = (AuthorityService) 
ApplicationContextFactory.getBean("authorityService");   
+      org.acegisecurity.Authentication authentication = 
SecurityContextHolder.getContext().getAuthentication();
+      if(authentication == null) return SKIP_BODY;
+      Set<String> authorityNames = 
authorityService.getAuthorityNamesForUser(authentication.getName());
+      
       for(int i = 0; i < pagegroups.size(); i++){
          Node group = pagegroups.get(i);
          if(authorityNames.contains(group.getValue("name"))) 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to