From 368dad4d78b15057f835f1a41c633ee3b7a83dcf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 01 Nov 2012 17:36:12 -0400
Subject: [PATCH] Include owned repositories while editing a user model
---
src/com/gitblit/models/UserModel.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index e81d7ca..23322c2 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -138,27 +138,26 @@
*/
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;
}
- if (AccessPermission.MISSING.equals(entry.getValue())) {
- // repository can not be found, permission is not editable
- editable = false;
- }
- 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;
@@ -252,7 +251,7 @@
ap.registrant = username;
ap.registrantType = RegistrantType.USER;
ap.permission = AccessPermission.NONE;
- ap.isEditable = false;
+ ap.mutable = false;
// administrator
if (canAdmin()) {
@@ -291,7 +290,7 @@
if (p != null) {
ap.permissionType = PermissionType.EXPLICIT;
ap.permission = p;
- ap.isEditable = true;
+ ap.mutable = true;
return ap;
}
} else {
--
Gitblit v1.9.1