From 4fea450fd3edfba6bb9e2c3c0a9231c6d227a09c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 19:49:46 -0500
Subject: [PATCH] Fixed nullpointer on pushing to an empty repository (issue 69)
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index 80621ae..4548619 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -58,8 +58,7 @@
public void populateItem(final Item<Activity> item) {
final Activity entry = item.getModelObject();
- item.add(WicketUtils.createDatestampLabel("title", entry.startDate, GitBlitWebSession
- .get().getTimezone()));
+ item.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
// display the commits in chronological order
DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",
@@ -72,7 +71,7 @@
// time of day
fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
- .getWhen(), GitBlitWebSession.get().getTimezone()));
+ .getWhen(), getTimeZone()));
// avatar
fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
@@ -94,10 +93,11 @@
fragment.add(authorLink);
// repository
+ String repoName = StringUtils.stripDotGit(commit.repository);
LinkPanel repositoryLink = new LinkPanel("repository", null,
- commit.repository, SummaryPage.class,
+ repoName, SummaryPage.class,
WicketUtils.newRepositoryParameter(commit.repository), true);
- WicketUtils.setCssBackground(repositoryLink, commit.repository);
+ WicketUtils.setCssBackground(repositoryLink, repoName);
fragment.add(repositoryLink);
// repository branch
--
Gitblit v1.9.1