From e627cfcaa9c567849cf11759260803ae380a034e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 16:58:14 -0500
Subject: [PATCH] Make activity page respect short commit id setting and lower default from 8 to 6
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 5 ++++-
distrib/gitblit.properties | 2 +-
src/com/gitblit/wicket/pages/RepositoryPage.java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 65e19ed..b830bd5 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -494,7 +494,7 @@
# Controls the length of shortened commit hash ids
#
# SINCE 1.2.0
-web.shortCommitIdLength = 8
+web.shortCommitIdLength = 6
# Use Clippy (Flash solution) to provide a copy-to-clipboard button.
# If false, a button with a more primitive JavaScript-based prompt box will
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 0a39985..c90e353 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -425,7 +425,7 @@
}
protected String getShortObjectId(String objectId) {
- return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 8));
+ return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 6));
}
protected void addRefs(Repository r, RevCommit c) {
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