From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 26 Nov 2013 15:58:15 -0500 Subject: [PATCH] Remove artifact setting from manager dialog --- src/main/java/com/gitblit/wicket/pages/TagPage.java | 16 ++++++++++++---- 1 files changed, 12 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 91c913d..afade81 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.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 RefsPanel("tagName", repositoryName, Arrays.asList(tagRef))); add(new Label("tagId", tagRef.getObjectId().getName())); add(new LinkPanel("taggedObject", "list", tagRef.getReferencedObjectId().getName(), @@ -89,11 +92,16 @@ } 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 Class<? extends BasePage> getRepoNavPageClass() { + return LogPage.class; + } } -- Gitblit v1.9.1