From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/TagPage.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TagPage.java b/src/main/java/com/gitblit/wicket/pages/TagPage.java
index 91c913d..ffeea6f 100644
--- a/src/main/java/com/gitblit/wicket/pages/TagPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TagPage.java
@@ -21,17 +21,21 @@
import java.util.List;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
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.AvatarImage;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;
+@CacheControl(LastModified.BOOT)
public class TagPage extends RepositoryPage {
public TagPage(PageParameters params) {
@@ -55,7 +59,7 @@
}
// Display tag.
- Class<? extends RepositoryPage> linkClass;
+ Class<? extends WebPage> linkClass;
PageParameters linkParameters = newCommitParameter(tagRef.getReferencedObjectId().getName());
String typeKey;
switch (tagRef.getReferencedObjectType()) {
@@ -73,9 +77,8 @@
linkClass = CommitPage.class;
break;
}
- add(new LinkPanel("commit", "title", tagRef.displayName, linkClass, linkParameters));
- add(new GravatarImage("taggerAvatar", tagRef.getAuthorIdent()));
-
+ add(new AvatarImage("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(),
@@ -89,11 +92,21 @@
}
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