From 75705a3b40a3f42bda57de62b29c6f853d94dfb8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Nov 2012 17:07:52 -0500
Subject: [PATCH] Short commit ids in log and history take two (issue 168)

---
 src/com/gitblit/wicket/panels/LogPanel.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 6d06e7b..0686dee 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -102,14 +102,6 @@
 				setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
 				item.add(authorLink);
 				
-				// commit hash link
-				LinkPanel commitHash = new LinkPanel("commitHash", null, entry.getName().substring(0, hashLen),
-						CommitPage.class, WicketUtils.newObjectParameter(
-								repositoryName, entry.getName()));
-				WicketUtils.setCssClass(commitHash, "sha1");
-				WicketUtils.setHtmlTooltip(commitHash, entry.getName());
-				item.add(commitHash);
-
 				// merge icon
 				if (entry.getParentCount() > 1) {
 					item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
@@ -135,8 +127,14 @@
 
 				item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));
 
-				item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
-						.newObjectParameter(repositoryName, entry.getName())));
+				// commit hash link
+				LinkPanel commitHash = new LinkPanel("hashLink", null, entry.getName().substring(0, hashLen),
+						CommitPage.class, WicketUtils.newObjectParameter(
+								repositoryName, entry.getName()));
+				WicketUtils.setCssClass(commitHash, "sha1");
+				WicketUtils.setHtmlTooltip(commitHash, entry.getName());
+				item.add(commitHash);
+				
 				item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils
 						.newObjectParameter(repositoryName, entry.getName())).setEnabled(entry
 						.getParentCount() > 0));

--
Gitblit v1.9.1