From 309c55b5a9670e7c327ad8d4e5d94b8af840d00f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 18 Nov 2011 17:46:06 -0500
Subject: [PATCH] Calculate repository color from name. Show swatch on repository list.
---
src/com/gitblit/models/UserModel.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 2964708..dadc44e 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -17,10 +17,20 @@
import java.io.Serializable;
import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
-public class UserModel implements Principal, Serializable {
+import com.gitblit.utils.StringUtils;
+
+/**
+ * UserModel is a serializable model class that represents a user and the user's
+ * restricted repository memberships. Instances of UserModels are also used as
+ * servlet user principals.
+ *
+ * @author James Moger
+ *
+ */
+public class UserModel implements Principal, Serializable, Comparable<UserModel> {
private static final long serialVersionUID = 1L;
@@ -28,14 +38,29 @@
public String username;
public String password;
public boolean canAdmin;
- public final List<String> repositories = new ArrayList<String>();
+ public boolean excludeFromFederation;
+ public final Set<String> repositories = new HashSet<String>();
public UserModel(String username) {
this.username = username;
}
+ /**
+ * This method does not take into consideration Ownership where the
+ * administrator has not explicitly granted access to the owner.
+ *
+ * @param repositoryName
+ * @return
+ */
+ @Deprecated
public boolean canAccessRepository(String repositoryName) {
return canAdmin || repositories.contains(repositoryName.toLowerCase());
+ }
+
+ public boolean canAccessRepository(RepositoryModel repository) {
+ boolean isOwner = !StringUtils.isEmpty(repository.owner)
+ && repository.owner.equals(username);
+ return canAdmin || isOwner || repositories.contains(repository.name.toLowerCase());
}
public void addRepository(String name) {
@@ -43,7 +68,7 @@
}
@Override
- public String getName() {
+ public String getName() {
return username;
}
@@ -51,4 +76,9 @@
public String toString() {
return username;
}
+
+ @Override
+ public int compareTo(UserModel o) {
+ return username.compareTo(o.username);
+ }
}
--
Gitblit v1.9.1