diff options
Diffstat (limited to 'src/main/java/com/gitblit')
| -rw-r--r-- | src/main/java/com/gitblit/models/RepositoryModel.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/models/UserModel.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java index f84e96b9..a81c622a 100644 --- a/src/main/java/com/gitblit/models/RepositoryModel.java +++ b/src/main/java/com/gitblit/models/RepositoryModel.java @@ -182,9 +182,9 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel public boolean isOwner(String username) {
if (StringUtils.isEmpty(username) || ArrayUtils.isEmpty(owners)) {
- return false;
+ return isUsersPersonalRepository(username);
}
- return owners.contains(username.toLowerCase());
+ return owners.contains(username.toLowerCase()) || isUsersPersonalRepository(username);
}
public boolean isPersonalRepository() {
diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index 64bca825..e1522748 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -552,15 +552,15 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> }
return false;
}
-
+
/**
* Returns true if the user is allowed to administer the specified repository
- *
+ *
* @param repo
* @return true if the user can administer the repository
*/
public boolean canAdmin(RepositoryModel repo) {
- return canAdmin() || isMyPersonalRepository(repo.name);
+ return canAdmin() || repo.isOwner(username) || isMyPersonalRepository(repo.name);
}
public boolean isAuthenticated() {
|