diff options
| author | James Moger <james.moger@gitblit.com> | 2012-11-01 17:32:13 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-11-01 17:32:13 -0400 |
| commit | b701ed7c4e138c4aaa3acb029f6e35fdf01388e4 (patch) | |
| tree | b0f4f06f43a9f4c25d53d906e3a4d001942041ac /src/com/gitblit/models | |
| parent | 3dec957f01b1e6b0af31476361efbb5767d0303d (diff) | |
| download | gitblit-b701ed7c4e138c4aaa3acb029f6e35fdf01388e4.tar.gz gitblit-b701ed7c4e138c4aaa3acb029f6e35fdf01388e4.zip | |
Ignore permission definitions for admins, it just confuses things
Diffstat (limited to 'src/com/gitblit/models')
| -rw-r--r-- | src/com/gitblit/models/TeamModel.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/models/UserModel.java | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/com/gitblit/models/TeamModel.java b/src/com/gitblit/models/TeamModel.java index 2560e5ce..9587ca7a 100644 --- a/src/com/gitblit/models/TeamModel.java +++ b/src/com/gitblit/models/TeamModel.java @@ -98,6 +98,10 @@ public class TeamModel implements Serializable, Comparable<TeamModel> { */
public List<RegistrantAccessPermission> getRepositoryPermissions() {
List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
+ if (canAdmin) {
+ // team has REWIND access to all repositories
+ return list;
+ }
for (Map.Entry<String, AccessPermission> entry : permissions.entrySet()) {
String registrant = entry.getKey();
String source = null;
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index 0c9b9cc1..23322c26 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -138,23 +138,26 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> */
public List<RegistrantAccessPermission> getRepositoryPermissions() {
List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
+ if (canAdmin()) {
+ // user has REWIND access to all repositories
+ return list;
+ }
for (Map.Entry<String, AccessPermission> entry : permissions.entrySet()) {
String registrant = entry.getKey();
+ AccessPermission ap = entry.getValue();
String source = null;
- boolean editable = true;
+ boolean mutable = true;
PermissionType pType = PermissionType.EXPLICIT;
- if (canAdmin()) {
- pType = PermissionType.ADMINISTRATOR;
- editable = false;
- } else if (isMyPersonalRepository(registrant)) {
+ if (isMyPersonalRepository(registrant)) {
pType = PermissionType.OWNER;
- editable = false;
+ ap = AccessPermission.REWIND;
+ mutable = false;
} else if (StringUtils.findInvalidCharacter(registrant) != null) {
// a regex will have at least 1 invalid character
pType = PermissionType.REGEX;
source = registrant;
}
- list.add(new RegistrantAccessPermission(registrant, entry.getValue(), pType, RegistrantType.REPOSITORY, source, editable));
+ list.add(new RegistrantAccessPermission(registrant, ap, pType, RegistrantType.REPOSITORY, source, mutable));
}
Collections.sort(list);
return list;
|