From efb1137546de9a32bfa23aeda9edd7dc4f597d05 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Sep 2012 09:35:54 -0400
Subject: [PATCH] Added Hamcrest-Core (JUnit) and Jakarta-Regexp (Lucene Memory)
---
src/com/gitblit/wicket/pages/ProjectPage.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ProjectPage.java b/src/com/gitblit/wicket/pages/ProjectPage.java
index be3cf38..808cc06 100644
--- a/src/com/gitblit/wicket/pages/ProjectPage.java
+++ b/src/com/gitblit/wicket/pages/ProjectPage.java
@@ -117,22 +117,22 @@
add(WicketUtils.syndicationDiscoveryLink(SyndicationServlet.getTitle(project.getDisplayName(),
null), feedLink));
- String groupName = projectName;
+ final String projectPath;
if (project.isRoot) {
- groupName = "";
+ projectPath = "";
} else {
- groupName += "/";
+ projectPath = projectName + "/";
}
// project markdown message
- File pmkd = new File(GitBlit.getRepositoriesFolder(), groupName + "project.mkd");
+ File pmkd = new File(GitBlit.getRepositoriesFolder(), projectPath + "project.mkd");
String pmessage = readMarkdown(projectName, pmkd);
Component projectMessage = new Label("projectMessage", pmessage)
.setEscapeModelStrings(false).setVisible(pmessage.length() > 0);
add(projectMessage);
// markdown message above repositories list
- File rmkd = new File(GitBlit.getRepositoriesFolder(), groupName + "repositories.mkd");
+ File rmkd = new File(GitBlit.getRepositoriesFolder(), projectPath + "repositories.mkd");
String rmessage = readMarkdown(projectName, rmkd);
Component repositoriesMessage = new Label("repositoriesMessage", rmessage)
.setEscapeModelStrings(false).setVisible(rmessage.length() > 0);
@@ -172,7 +172,7 @@
swatch.setVisible(showSwatch);
PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
- item.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
+ item.add(new LinkPanel("repositoryName", "list", StringUtils.getRelativePath(projectPath, StringUtils.stripDotGit(entry.name)), SummaryPage.class, pp));
item.add(new Label("repositoryDescription", entry.description).setVisible(!StringUtils.isEmpty(entry.description)));
item.add(new BookmarkablePageLink<Void>("tickets", TicketsPage.class, pp).setVisible(entry.useTickets));
--
Gitblit v1.9.1