Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity

added assigned permissions to ScmState

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-05-26 13:14:59 +02:00
parent d2097bda05
commit ea39ecb365
6 changed files with 144 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/security/PermissionCollector.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -100,7 +101,7 @@ public class PermissionCollector
*/
public List<Permission> collect(User user, GroupNames groups)
{
Builder<Permission> builder = new Builder<Permission>();
Builder<Permission> builder = ImmutableList.builder();
collectRepositoryPermissions(builder, user, groups);
collectGlobalPermissions(builder, user, groups);

6
scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java
View File

@@ -30,6 +30,7 @@
*/
package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
@@ -55,9 +56,6 @@ import java.util.Locale;
public class RepositoryPermissionResolver implements PermissionResolver
{
/** Field description */
private static final String TYPE_REPOSITORY = "repository";
/**
* the logger for RepositoryPermissionResolver
*/
@@ -86,7 +84,7 @@ public class RepositoryPermissionResolver implements PermissionResolver
{
String type = permissionIt.next();
if (type.equals(TYPE_REPOSITORY))
if (type.equals(RepositoryPermission.TYPE))
{
permission = createRepositoryPermission(permissionIt);
}