From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index 395200c..1ca483c 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -32,7 +32,6 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.QueryResult;
-import com.gitblit.tickets.TicketIndexer.Lucene;
import com.gitblit.tickets.TicketLabel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.BugtraqProcessor;
@@ -77,10 +76,7 @@
if (showRepository) {
String name = StringUtils.stripDotGit(ticket.repository);
- PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository));
- for (String state : TicketsUI.openStatii) {
- rp.add(Lucene.status.name(), state);
- }
+ PageParameters rp = WicketUtils.newOpenTicketsParameter(ticket.repository);
LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp);
WicketUtils.setCssBackground(link, name);
item.add(link);
@@ -127,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