From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/wicket/pages/TagPage.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java
index 71a8645..b1ab071 100644
--- a/src/com/gitblit/wicket/pages/TagPage.java
+++ b/src/com/gitblit/wicket/pages/TagPage.java
@@ -17,6 +17,7 @@
import java.text.MessageFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import org.apache.wicket.PageParameters;
@@ -26,7 +27,6 @@
import com.gitblit.models.RefModel;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;
@@ -39,7 +39,7 @@
Repository r = getRepository();
// Find tag in repository
- List<RefModel> tags = JGitUtils.getTags(r, -1);
+ List<RefModel> tags = JGitUtils.getTags(r, true, -1);
RefModel tagRef = null;
for (RefModel tag : tags) {
if (tag.getName().equals(objectId) || tag.getObjectId().getName().equals(objectId)) {
@@ -79,9 +79,12 @@
linkClass, linkParameters));
add(new Label("taggedObjectType", getString(typeKey)));
- add(createPersonPanel("tagger", tagRef.getAuthorIdent(), SearchType.AUTHOR));
- add(WicketUtils.createTimestampLabel("tagDate", tagRef.getAuthorIdent().getWhen(),
- getTimeZone()));
+ add(createPersonPanel("tagger", tagRef.getAuthorIdent(), com.gitblit.Constants.SearchType.AUTHOR));
+ Date when = new Date(0);
+ if (tagRef.getAuthorIdent() != null) {
+ when = tagRef.getAuthorIdent().getWhen();
+ }
+ add(WicketUtils.createTimestampLabel("tagDate", when, getTimeZone()));
addFullText("fullMessage", tagRef.getFullMessage(), true);
}
--
Gitblit v1.9.1