From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/main/java/com/gitblit/wicket/panels/ActivityPanel.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
index 669c36b..e5c8e46 100644
--- a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
@@ -22,6 +22,7 @@
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants;
import com.gitblit.GitBlit;
@@ -39,9 +40,9 @@
/**
* Renders activity in day-blocks in reverse-chronological order.
- *
+ *
* @author James Moger
- *
+ *
*/
public class ActivityPanel extends BasePanel {
@@ -51,12 +52,13 @@
super(wicketId);
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;
+ @Override
public void populateItem(final Item<Activity> activityItem) {
final Activity entry = activityItem.getModelObject();
activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils()));
@@ -66,6 +68,7 @@
new ListDataProvider<RepositoryCommit>(entry.getCommits())) {
private static final long serialVersionUID = 1L;
+ @Override
public void populateItem(final Item<RepositoryCommit> commitItem) {
final RepositoryCommit commit = commitItem.getModelObject();
@@ -101,7 +104,7 @@
commitItem.add(repositoryLink);
// repository branch
- LinkPanel branchLink = new LinkPanel("branch", "list", commit.branch,
+ LinkPanel branchLink = new LinkPanel("branch", "list", Repository.shortenRefName(commit.branch),
LogPage.class, WicketUtils.newObjectParameter(commit.repository,
commit.branch), true);
WicketUtils.setCssStyle(branchLink, "color: #008000;");
@@ -137,7 +140,7 @@
WicketUtils.newObjectParameter(commit.repository, commit.getName()))
.setEnabled(commit.getParentCount() > 0));
commitItem.add(new BookmarkablePageLink<Void>("tree", TreePage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName())));
+ WicketUtils.newObjectParameter(commit.repository, commit.getName())));
}
};
activityItem.add(commits);
--
Gitblit v1.9.1