From d83bd6d3acfc88a991a08a15dfa3ac36770bb0b8 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Nov 2012 17:08:53 -0500 Subject: [PATCH] Fixed history page links for files not in the current/active commit (issue 166) --- src/com/gitblit/wicket/panels/ActivityPanel.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java index 2e70a9a..9a123d8 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/com/gitblit/wicket/panels/ActivityPanel.java @@ -24,6 +24,8 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import com.gitblit.Constants; +import com.gitblit.GitBlit; +import com.gitblit.Keys; import com.gitblit.models.Activity; import com.gitblit.models.Activity.RepositoryCommit; import com.gitblit.utils.StringUtils; @@ -50,6 +52,7 @@ Collections.sort(recentActivity); + final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6); DataView<Activity> activityView = new DataView<Activity>("activity", new ListDataProvider<Activity>(recentActivity)) { private static final long serialVersionUID = 1L; @@ -105,7 +108,7 @@ commitItem.add(branchLink); LinkPanel commitid = new LinkPanel("commitid", "list subject", - commit.getShortName(), CommitPage.class, + commit.getName().substring(0, shortHashLen), CommitPage.class, WicketUtils.newObjectParameter(commit.repository, commit.getName()), true); commitItem.add(commitid); -- Gitblit v1.9.1