From b1dba764c201f4708b82767b2d91edb6e189ce6f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 22 Jul 2011 10:09:18 -0400
Subject: [PATCH] Fixed (again) empty repository check (issue 13)
---
src/com/gitblit/models/UserModel.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 797c14e..aeeecf4 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -16,10 +16,19 @@
package com.gitblit.models;
import java.io.Serializable;
+import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
-public class UserModel implements Serializable {
+/**
+ * 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 {
private static final long serialVersionUID = 1L;
@@ -34,12 +43,7 @@
}
public boolean canAccessRepository(String repositoryName) {
- return canAdmin || repositories.contains(repositoryName);
- }
-
- public void setRepositories(List<String> repositories) {
- this.repositories.clear();
- this.repositories.addAll(repositories);
+ return canAdmin || repositories.contains(repositoryName.toLowerCase());
}
public void addRepository(String name) {
@@ -47,6 +51,11 @@
}
@Override
+ public String getName() {
+ return username;
+ }
+
+ @Override
public String toString() {
return username;
}
--
Gitblit v1.9.1