From c75304637f5535e634e57d4ed933c0fdb594d890 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Oct 2011 08:08:00 -0400
Subject: [PATCH] Added a list branches rpc
---
src/com/gitblit/wicket/pages/CommitPage.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index 3e3dcb8..ad33446 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -92,9 +92,9 @@
add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class,
newCommitParameter()));
add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));
- add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest()
- .getRelativePathPrefixToContextRoot(), repositoryName, objectId, null))
- .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
+ final String baseUrl = WicketUtils.getGitblitURL(getRequest());
+ add(new ExternalLink("zipLink", DownloadZipServlet.asLink(baseUrl, repositoryName,
+ objectId, null)).setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
// Parent Commits
ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents);
@@ -150,22 +150,26 @@
item.add(changeType);
if (entry.isTree()) {
item.add(new LinkPanel("pathName", null, entry.path, TreePage.class,
- newPathParameter(entry.path)));
+ WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path)));
} else {
item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,
- newPathParameter(entry.path)));
+ WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path)));
}
- item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class,
- newPathParameter(entry.path)).setEnabled(!entry.changeType
- .equals(ChangeType.ADD) && !entry.changeType.equals(ChangeType.DELETE)));
- item.add(new BookmarkablePageLink<Void>("view", BlobPage.class,
- newPathParameter(entry.path)));
- item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,
- newPathParameter(entry.path)));
- item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
- newPathParameter(entry.path)).setEnabled(!entry.changeType
- .equals(ChangeType.ADD)));
+ item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path))
+ .setEnabled(!entry.changeType.equals(ChangeType.ADD)
+ && !entry.changeType.equals(ChangeType.DELETE)));
+ item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path)));
+ item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path))
+ .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
+ item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path))
+ .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
--
Gitblit v1.9.1