From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/pages/TagPage.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java
index 71a8645..91c913d 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,8 +27,8 @@
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.GravatarImage;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;
@@ -39,7 +40,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)) {
@@ -50,7 +51,7 @@
// Failed to find tag!
if (tagRef == null) {
- error(MessageFormat.format("Could not find tag {0}", objectId), true);
+ error(MessageFormat.format(getString("gb.couldNotFindTag"), objectId), true);
}
// Display tag.
@@ -73,15 +74,20 @@
break;
}
add(new LinkPanel("commit", "title", tagRef.displayName, linkClass, linkParameters));
+ add(new GravatarImage("taggerAvatar", tagRef.getAuthorIdent()));
+
add(new RefsPanel("tagName", repositoryName, Arrays.asList(tagRef)));
add(new Label("tagId", tagRef.getObjectId().getName()));
add(new LinkPanel("taggedObject", "list", tagRef.getReferencedObjectId().getName(),
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(), getTimeUtils()));
addFullText("fullMessage", tagRef.getFullMessage(), true);
}
--
Gitblit v1.9.1