Author: kien_nguyen Date: 2010-11-04 04:09:36 -0400 (Thu, 04 Nov 2010) New Revision: 4938 Modified: portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java Log: GTNPORTAL-633 update permission for listing portal Modified: portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-04 07:14:25 UTC (rev 4937) +++ portal/branches/branch-GTNPORTAL-1592/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-04 08:09:36 UTC (rev 4938) @@ -148,27 +148,26 @@ //TODO: This following line is fixed for bug PORTAL-2127 uiListPermissionSelector.getChild(UIFormPopupWindow.class).setId("UIPageFormPopupGroupMembershipSelector"); - UserPortalConfig userPortalConfig = - configService.getUserPortalConfig(pcontext.getPortalOwner(), pcontext.getRemoteUser()); + List<String> portals = configService.getAllPortalNames(); + Collections.sort(portals); + List<SelectItemOption<String>> portalsItem = new ArrayList<SelectItemOption<String>>(); ExoContainer container = ExoContainerContext.getCurrentContainer(); UserACL acl = (UserACL)container.getComponentInstanceOfType(UserACL.class); - if (acl.hasEditPermission(userPortalConfig.getPortalConfig())) + for (String p : portals) { - ownerTypes.add(new SelectItemOption<String>(PortalConfig.PORTAL_TYPE)); - List<String> portals = configService.getAllPortalNames(); - if (portals.size() > 0) + UserPortalConfig userPortalConfig = configService.getUserPortalConfig(p, pcontext.getRemoteUser()); + if (acl.hasEditPermission(userPortalConfig.getPortalConfig())) { - Collections.sort(portals); - List<SelectItemOption<String>> portalsItem = new ArrayList<SelectItemOption<String>>(); - for (String p : portals) - { - portalsItem.add(new SelectItemOption<String>(p)); - } - portalIdSelectBox = new UIFormSelectBox(OWNER_ID, OWNER_ID, portalsItem); - portalIdSelectBox.setOnChange("ChangeOwnerId"); - portalIdSelectBox.setParent(uiSettingSet); + portalsItem.add(new SelectItemOption<String>(p)); } } + if(portalsItem.size() > 0) + { + ownerTypes.add(new SelectItemOption<String>(PortalConfig.PORTAL_TYPE)); + portalIdSelectBox = new UIFormSelectBox(OWNER_ID, OWNER_ID, portalsItem); + portalIdSelectBox.setOnChange("ChangeOwnerId"); + portalIdSelectBox.setParent(uiSettingSet); + } List<String> groups = configService.getMakableNavigations(pcontext.getRemoteUser(), true); if (groups.size() > 0)