Author: kevinshen Date: 2010-01-28 04:38:02 +0100 (Thu, 28 Jan 2010) New Revision: 40743
Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java Log: CMSC-1626 SS0 - Demo views are depending on community Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-27 14:41:30 UTC (rev 40742) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-28 03:38:02 UTC (rev 40743) @@ -1,10 +1,7 @@ <%...@page language="java" contentType="text/html;charset=UTF-8"%> <%...@page import="com.finalist.cmsc.portalImpl.SecureUtil" %> <%...@include file="../globals.jsp"%> -<mm:haspage page="/editors/community"> - <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> - <c:set var="sso"><%= SecureUtil.getEnvironment("useSSO")%></c:set> -</mm:haspage> +<c:set var="sso"><%= SecureUtil.getEnvironment("useSSO")%></c:set> <mm:content type="text/html" encoding="UTF-8" expires="0"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> <html:html xhtml="true"> Modified: CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java 2010-01-27 14:41:30 UTC (rev 40742) +++ CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/SecureUtil.java 2010-01-28 03:38:02 UTC (rev 40743) @@ -21,20 +21,9 @@ private static final Logger log = Logger.getLogger(SecureUtil.class); public static boolean isAllowedToSee(NavigationItem item) { - Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud(); - Node node = cloud.getNode(item.getId()); - NodeList groups = node.getRelatedNodes("pagegroup"); - if(groups.size() == 0) { - return true; - } - for(NodeIterator i = groups.nodeIterator(); i.hasNext(); ) { - Node group = i.nextNode(); - if(Community.hasAuthority(group.getStringValue("name"))) { - return true; - } - } - return false; + return isReadable(Integer.toString(item.getId())); } + public static String getEnvironment(String name) { String value = null; Context env = null; @@ -60,5 +49,21 @@ log.error("Get environment "+name+" error :"+e); } return value; + } + + public static boolean isReadable(String pageId) { + Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud(); + Node node = cloud.getNode(pageId); + NodeList groups = node.getRelatedNodes("pagegroup"); + if(groups.size() == 0) { + return true; + } + for(NodeIterator i = groups.nodeIterator(); i.hasNext(); ) { + Node group = i.nextNode(); + if(Community.hasAuthority(group.getStringValue("name"))) { + return true; + } + } + return false; } } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
