From 41dd02a437c174ed71fd6c8b3d76000bbbcbc3bd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Jun 2014 10:54:22 -0400
Subject: [PATCH] Fix WAR web.xml generation regression
---
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index fc0431f..1ca483c 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -40,7 +40,6 @@
import com.gitblit.wicket.TicketsUI;
import com.gitblit.wicket.TicketsUI.Indicator;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TicketsPage;
import com.gitblit.wicket.pages.UserPage;
@@ -73,16 +72,16 @@
WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color));
}
- PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository);
PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number);
if (showRepository) {
String name = StringUtils.stripDotGit(ticket.repository);
- LinkPanel link = new LinkPanel("repositoryLink", null, name, SummaryPage.class, rp);
+ PageParameters rp = WicketUtils.newOpenTicketsParameter(ticket.repository);
+ LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp);
WicketUtils.setCssBackground(link, name);
item.add(link);
} else {
- item.add(new Label("repositoryLink").setVisible(false));
+ item.add(new Label("ticketsLink").setVisible(false));
}
item.add(TicketsUI.getStateIcon("state", ticket.type, ticket.status));
@@ -124,7 +123,7 @@
public void populateItem(final Item<String> labelItem) {
BugtraqProcessor btp = new BugtraqProcessor(app().settings());
Repository db = app().repositories().getRepository(repository.name);
- String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject());
+ String content = btp.processText(db, repository.name, labelItem.getModelObject());
db.close();
Label label = new Label("label", content);
label.setEscapeModelStrings(false);
--
Gitblit v1.9.1