From 020a4d6dccfa25235a1481efc3e449a73a0d659a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 24 Oct 2013 08:12:03 -0400
Subject: [PATCH] Merge pull request #119 from simonharrer/fix-locale-test-run-bug
---
src/main/java/com/gitblit/models/ProjectModel.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/models/ProjectModel.java b/src/main/java/com/gitblit/models/ProjectModel.java
index 9e5d523..3a082de 100644
--- a/src/main/java/com/gitblit/models/ProjectModel.java
+++ b/src/main/java/com/gitblit/models/ProjectModel.java
@@ -21,13 +21,14 @@
import java.util.HashSet;
import java.util.Set;
+import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
/**
* ProjectModel is a serializable model class.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ProjectModel implements Serializable, Comparable<ProjectModel> {
@@ -38,7 +39,7 @@
public String title;
public String description;
public final Set<String> repositories = new HashSet<String>();
-
+
public String projectMarkdown;
public String repositoriesMarkdown;
public Date lastChange;
@@ -47,7 +48,7 @@
public ProjectModel(String name) {
this(name, false);
}
-
+
public ProjectModel(String name, boolean isRoot) {
this.name = name;
this.isRoot = isRoot;
@@ -55,9 +56,9 @@
this.title = "";
this.description = "";
}
-
+
public boolean isUserProject() {
- return name.charAt(0) == '~';
+ return ModelUtils.isPersonalRepository(name);
}
public boolean hasRepository(String name) {
@@ -79,16 +80,16 @@
for (String name:names) {
repositories.add(name.toLowerCase());
}
- }
+ }
public void removeRepository(String name) {
repositories.remove(name.toLowerCase());
}
-
+
public String getDisplayName() {
return StringUtils.isEmpty(title) ? name : title;
}
-
+
@Override
public String toString() {
return name;
--
Gitblit v1.9.1