From 61b094152515532b42aa5e918f5405d82cde0440 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 16:27:17 -0400
Subject: [PATCH] Fixed ticgit pages.
---
src/com/gitblit/wicket/pages/TagPage.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java
index d6b6c68..e6f2fd6 100644
--- a/src/com/gitblit/wicket/pages/TagPage.java
+++ b/src/com/gitblit/wicket/pages/TagPage.java
@@ -1,14 +1,17 @@
package com.gitblit.wicket.pages;
+import java.util.List;
+
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
+import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.models.RefModel;
public class TagPage extends RepositoryPage {
@@ -16,15 +19,31 @@
public TagPage(PageParameters params) {
super(params);
- Repository r = getRepository();
- RevCommit c = JGitUtils.getCommit(r, commitId);
+ Repository r = getRepository();
+ List<RefModel> tags = JGitUtils.getTags(r, -1);
+ RevCommit c = JGitUtils.getCommit(r, objectId);
+
+ RefModel tagRef = null;
+ // determine tag
+ for (RefModel tag:tags) {
+ if (tag.getName().equals(objectId) || tag.getObjectId().getName().equals(objectId)) {
+ tagRef = tag;
+ break;
+ }
+ }
- add(new LinkPanel("commit", "title", c.getName(), CommitPage.class, newCommitParameter()));
-
- add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ if (tagRef == null) {
+ // point to commit
+ add(new LinkPanel("commit", "title", c.getShortMessage(), CommitPage.class, newCommitParameter()));
+ add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ } else {
+ // TODO commit or tree or blob?
+ add(new LinkPanel("commit", "title", tagRef.getDisplayName(), CommitPage.class, newCommitParameter()));
+ add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ }
+
add(new Label("tagAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));
- String authorDate = GitBlitWebSession.get().formatDateTimeLong(c.getAuthorIdent().getWhen());
- add(new Label("tagDate", authorDate));
+ add(WicketUtils.createTimestampLabel("tagDate", c.getAuthorIdent().getWhen(), getTimeZone()));
addFullText("fullMessage", c.getFullMessage(), true);
}
--
Gitblit v1.9.1