This commit is contained in:
Sebastian Sdorra
2012-10-04 11:09:12 +02:00
parent c2f34ffa6e
commit 8e95f3d6bf

View File

@@ -509,10 +509,7 @@ public class ScmRealm extends AuthorizingRealm
for (Permission permission : repositoryPermissions) for (Permission permission : repositoryPermissions)
{ {
if ((permission.isGroupPermission() if (isUserPermission(user, groups, permission))
&& groups.contains(
permission.getName())) || ((!permission.isGroupPermission())
&& user.getName().equals(permission.getName())))
{ {
RepositoryPermission rp = new RepositoryPermission(repository, RepositoryPermission rp = new RepositoryPermission(repository,
permission.getType()); permission.getType());
@@ -713,6 +710,25 @@ public class ScmRealm extends AuthorizingRealm
return result; return result;
} }
/**
* Method description
*
*
* @param user
* @param groups
* @param perm
*
* @return
*/
private boolean isUserPermission(User user, GroupNames groups,
Permission perm)
{
//J-
return (perm.isGroupPermission() && groups.contains(perm.getName()))
|| ((!perm.isGroupPermission()) && user.getName().equals(perm.getName()));
//J+
}
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------
/** Field description */ /** Field description */