From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Sep 2012 20:26:27 +0000 (-0400)
Subject: Strip folder name and .git from repo links in the project view
X-Git-Tag: v1.2.0~235
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fabe060d3a435f116128851f828e35c2af5fde67;p=gitblit.git

Strip folder name and .git from repo links in the project view
---

diff --git a/src/com/gitblit/wicket/pages/ProjectPage.java b/src/com/gitblit/wicket/pages/ProjectPage.java
index be3cf389..808cc065 100644
--- a/src/com/gitblit/wicket/pages/ProjectPage.java
+++ b/src/com/gitblit/wicket/pages/ProjectPage.java
@@ -117,22 +117,22 @@ public class ProjectPage extends RootPage {
 		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 @@ public class ProjectPage extends RootPage {
 				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));