From 9b89bf102d1fb2cb96ce96eec746a594e539125c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Jun 2014 23:31:09 -0400
Subject: [PATCH] Merge branch 'ticket/118' into develop
---
src/main/java/com/gitblit/manager/ProjectManager.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/ProjectManager.java b/src/main/java/com/gitblit/manager/ProjectManager.java
index b30f4f1..666f521 100644
--- a/src/main/java/com/gitblit/manager/ProjectManager.java
+++ b/src/main/java/com/gitblit/manager/ProjectManager.java
@@ -178,19 +178,20 @@
map.put("", configs.get(""));
for (RepositoryModel model : repositoryManager.getRepositoryModels(user)) {
- String rootPath = StringUtils.getRootPath(model.name).toLowerCase();
- if (!map.containsKey(rootPath)) {
+ String projectPath = StringUtils.getRootPath(model.name);
+ String projectKey = projectPath.toLowerCase();
+ if (!map.containsKey(projectKey)) {
ProjectModel project;
- if (configs.containsKey(rootPath)) {
+ if (configs.containsKey(projectKey)) {
// clone the project model because it's repository list will
// be tailored for the requesting user
- project = DeepCopier.copy(configs.get(rootPath));
+ project = DeepCopier.copy(configs.get(projectKey));
} else {
- project = new ProjectModel(rootPath);
+ project = new ProjectModel(projectPath);
}
- map.put(rootPath, project);
+ map.put(projectKey, project);
}
- map.get(rootPath).addRepository(model);
+ map.get(projectKey).addRepository(model);
}
// sort projects, root project first
--
Gitblit v1.9.1