[gatein-commits] gatein SVN: r457 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.

Author: liem_nguyen Date: 2009-10-30 06:35:24 -0400 (Fri, 30 Oct 2009) New Revision: 457 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java Log: GTNPORTAL-70 Can't add user into group in specical case Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2009-10-30 09:43:53 UTC (rev 456) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2009-10-30 10:35:24 UTC (rev 457) @@ -146,6 +146,8 @@ { if (username == null) username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser(); + if (username.equals(getUserACL().getSuperUser())) + return true; return isMemberOfGroup(username, getUserACL().getAdminGroups()); } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2009-10-30 09:43:53 UTC (rev 456) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2009-10-30 10:35:24 UTC (rev 457) @@ -121,7 +121,8 @@ sibblingsGroup_ = service.getGroupHandler().findGroups(parentGroup); // if not administrator - if (!GroupManagement.isAdministrator(null)) + String username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser(); + if (!GroupManagement.isSuperUserOfGroup(username, groupId)) { childrenGroup_ = GroupManagement.getRelatedGroups(null, childrenGroup_); sibblingsGroup_ = GroupManagement.getRelatedGroups(null, sibblingsGroup_);