From f602a2f552e1389ee465307723b492b1af378fd5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 16 Apr 2011 16:28:19 -0400
Subject: [PATCH] Working history feature. Tweak to paging.
---
src/com/gitblit/wicket/pages/TreePage.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 5ebb1b6..2ab164d 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -26,22 +26,22 @@
public TreePage(PageParameters params) {
super(params);
- final String basePath = WicketUtils.getPath(params);
+ final String path = WicketUtils.getPath(params);
Repository r = getRepository();
RevCommit commit = JGitUtils.getCommit(r, objectId);
- List<PathModel> paths = JGitUtils.getFilesInPath(r, basePath, commit);
+ List<PathModel> paths = JGitUtils.getFilesInPath(r, path, commit);
// tree page links
add(new Label("historyLink", getString("gb.history")));
- add(new BookmarkablePageLink<Void>("headLink", TreePage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, basePath)));
+ add(new BookmarkablePageLink<Void>("headLink", TreePage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
// breadcrumbs
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, objectId));
- if (basePath != null && basePath.trim().length() > 0) {
- paths.add(0, PathModel.getParentPath(basePath, objectId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
+ if (path != null && path.trim().length() > 0) {
+ paths.add(0, PathModel.getParentPath(path, objectId));
}
final ByteFormat byteFormat = new ByteFormat();
@@ -69,7 +69,7 @@
// links
Fragment links = new Fragment("pathLinks", "treeLinks", this);
links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
- links.add(new BookmarkablePageLink<Void>("history", TreePage.class).setEnabled(false));
+ links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
item.add(links);
} else {
// blob link
@@ -81,7 +81,7 @@
links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
links.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
- links.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
+ links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
item.add(links);
}
}
--
Gitblit v1.9.1