From 2654d99368054b7f8cfaec056b599cac4cfb53d9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 09:48:27 -0400
Subject: [PATCH] Merge branch 'ticket/196' into develop
---
src/main/java/com/gitblit/wicket/pages/TagPage.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TagPage.java b/src/main/java/com/gitblit/wicket/pages/TagPage.java
index ff910fb..9eed279 100644
--- a/src/main/java/com/gitblit/wicket/pages/TagPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TagPage.java
@@ -28,11 +28,14 @@
import com.gitblit.models.RefModel;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.wicket.CacheControl;
+import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.GravatarImage;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;
+@CacheControl(LastModified.BOOT)
public class TagPage extends RepositoryPage {
public TagPage(PageParameters params) {
@@ -74,9 +77,8 @@
linkClass = CommitPage.class;
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(),
@@ -90,14 +92,19 @@
}
add(WicketUtils.createTimestampLabel("tagDate", when, getTimeZone(), getTimeUtils()));
- addFullText("fullMessage", tagRef.getFullMessage(), true);
+ addFullText("fullMessage", tagRef.getFullMessage());
}
@Override
protected String getPageName() {
return getString("gb.tag");
}
-
+
+ @Override
+ protected boolean isCommitPage() {
+ return true;
+ }
+
@Override
protected Class<? extends BasePage> getRepoNavPageClass() {
return LogPage.class;
--
Gitblit v1.9.1