Преглед на файлове

Merge branch 'ticket/118' into develop

tags/v1.7.0
James Moger преди 10 години
родител
ревизия
9b89bf102d
променени са 1 файла, в които са добавени 8 реда и са изтрити 7 реда
  1. 8
    7
      src/main/java/com/gitblit/manager/ProjectManager.java

+ 8
- 7
src/main/java/com/gitblit/manager/ProjectManager.java Целия файл

map.put("", configs.get("")); map.put("", configs.get(""));


for (RepositoryModel model : repositoryManager.getRepositoryModels(user)) { 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; ProjectModel project;
if (configs.containsKey(rootPath)) {
if (configs.containsKey(projectKey)) {
// clone the project model because it's repository list will // clone the project model because it's repository list will
// be tailored for the requesting user // be tailored for the requesting user
project = DeepCopier.copy(configs.get(rootPath));
project = DeepCopier.copy(configs.get(projectKey));
} else { } 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 // sort projects, root project first

Loading…
Отказ
Запис