diff options
| author | James Moger <james.moger@gitblit.com> | 2013-01-23 07:52:20 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-01-23 07:52:20 -0500 |
| commit | 661db6c2948e4848b29645c66e17cbfcaa780ae0 (patch) | |
| tree | c3b8289168ebdb45838391f0f4edab3849d35515 /src/com/gitblit/models/UserModel.java | |
| parent | fb9813874c811ae06604c30d875e9dce57df9874 (diff) | |
| download | gitblit-661db6c2948e4848b29645c66e17cbfcaa780ae0.tar.gz gitblit-661db6c2948e4848b29645c66e17cbfcaa780ae0.zip | |
Revised multiple owners contribution
Diffstat (limited to 'src/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/com/gitblit/models/UserModel.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index c513febc..bec011d9 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -108,7 +108,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> @Deprecated
@Unused
public boolean canAccessRepository(RepositoryModel repository) {
- boolean isOwner = repository.isRepoAdministrator(username);
+ boolean isOwner = repository.isOwner(username);
boolean allowAuthenticated = isAuthenticated && AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl);
return canAdmin() || isOwner || repositories.contains(repository.name.toLowerCase())
|| hasTeamAccess(repository.name) || allowAuthenticated;
@@ -303,7 +303,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
// repository owner - either specified owner or personal repository
- if (repository.isRepoAdministrator(username) || repository.isUsersPersonalRepository(username)) {
+ if (repository.isOwner(username) || repository.isUsersPersonalRepository(username)) {
ap.permissionType = PermissionType.OWNER;
ap.permission = AccessPermission.REWIND;
return ap;
@@ -411,7 +411,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> // can not fork your own repository
return false;
}
- if (canAdmin() || repository.isRepoAdministrator(username)) {
+ if (canAdmin() || repository.isOwner(username)) {
return true;
}
if (!repository.allowForks) {
@@ -428,7 +428,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
public boolean canEdit(RepositoryModel model) {
- return canAdmin() || model.isUsersPersonalRepository(username) || model.isRepoAdministrator(username);
+ return canAdmin() || model.isUsersPersonalRepository(username) || model.isOwner(username);
}
/**
|