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/client/GitblitClient.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/client/GitblitClient.java')
| -rw-r--r-- | src/com/gitblit/client/GitblitClient.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java index 1101cd60..01db46e5 100644 --- a/src/com/gitblit/client/GitblitClient.java +++ b/src/com/gitblit/client/GitblitClient.java @@ -162,7 +162,7 @@ public class GitblitClient implements Serializable { }
public boolean isOwner(RepositoryModel model) {
- return account != null && account.equalsIgnoreCase(model.owner);
+ return model.isRepoAdministrator(account);
}
public String getURL(String action, String repository, String objectId) {
@@ -532,7 +532,7 @@ public class GitblitClient implements Serializable { // TODO reconsider ownership as a user property
// manually specify personal repository ownerships
for (RepositoryModel rm : allRepositories) {
- if (rm.isUsersPersonalRepository(user.username) || rm.isOwner(user.username)) {
+ if (rm.isUsersPersonalRepository(user.username) || rm.isRepoAdministrator(user.username)) {
RegistrantAccessPermission rp = new RegistrantAccessPermission(rm.name, AccessPermission.REWIND,
PermissionType.OWNER, RegistrantType.REPOSITORY, null, false);
// user may be owner of a repository to which they've inherited
|