diff options
| author | SHaselbauer <sarah.haselbauer@akquinet.de> | 2013-01-21 16:28:11 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-01-21 16:28:11 -0500 |
| commit | fb9813874c811ae06604c30d875e9dce57df9874 (patch) | |
| tree | 457e22ea6df7f34501bb14a0e94fc5644ab8dbe2 /src/com/gitblit/models/UserModel.java | |
| parent | 1f82620a088efa2ba3254df1805e229266690673 (diff) | |
| download | gitblit-fb9813874c811ae06604c30d875e9dce57df9874.tar.gz gitblit-fb9813874c811ae06604c30d875e9dce57df9874.zip | |
Merge multiple owners feature (pull request #63, #66)
Diffstat (limited to 'src/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/com/gitblit/models/UserModel.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index 54e81cb5..c513febc 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -108,8 +108,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> @Deprecated
@Unused
public boolean canAccessRepository(RepositoryModel repository) {
- boolean isOwner = !StringUtils.isEmpty(repository.owner)
- && repository.owner.equals(username);
+ boolean isOwner = repository.isRepoAdministrator(username);
boolean allowAuthenticated = isAuthenticated && AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl);
return canAdmin() || isOwner || repositories.contains(repository.name.toLowerCase())
|| hasTeamAccess(repository.name) || allowAuthenticated;
@@ -304,7 +303,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
// repository owner - either specified owner or personal repository
- if (repository.isOwner(username) || repository.isUsersPersonalRepository(username)) {
+ if (repository.isRepoAdministrator(username) || repository.isUsersPersonalRepository(username)) {
ap.permissionType = PermissionType.OWNER;
ap.permission = AccessPermission.REWIND;
return ap;
@@ -412,7 +411,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> // can not fork your own repository
return false;
}
- if (canAdmin() || repository.isOwner(username)) {
+ if (canAdmin() || repository.isRepoAdministrator(username)) {
return true;
}
if (!repository.allowForks) {
@@ -429,7 +428,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
public boolean canEdit(RepositoryModel model) {
- return canAdmin() || model.isUsersPersonalRepository(username) || model.isOwner(username);
+ return canAdmin() || model.isUsersPersonalRepository(username) || model.isRepoAdministrator(username);
}
/**
|