From 8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 09:33:07 -0400
Subject: [PATCH] Prepare v1.6.1 documentation updates
---
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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..cc0b57a 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;
@@ -65,24 +64,23 @@
@Override
protected void populateItem(Item<QueryResult> item) {
final QueryResult ticket = item.getModelObject();
- final RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository);
if (showSwatch) {
// set repository color
- String color = StringUtils.getColor(StringUtils.stripDotGit(repository.name));
+ String color = StringUtils.getColor(StringUtils.stripDotGit(ticket.repository));
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));
@@ -122,13 +120,25 @@
@Override
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());
- db.close();
- Label label = new Label("label", content);
- label.setEscapeModelStrings(false);
- TicketLabel tLabel = app().tickets().getLabel(repository, labelItem.getModelObject());
+ RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository);
+ Label label;
+ TicketLabel tLabel;
+ if (repository == null) {
+ label = new Label("label", labelItem.getModelObject());
+ tLabel = new TicketLabel(labelItem.getModelObject());
+ } else {
+ Repository db = app().repositories().getRepository(repository.name);
+ BugtraqProcessor btp = new BugtraqProcessor(app().settings());
+ String content = btp.processText(db, repository.name, labelItem.getModelObject());
+ String safeContent = app().xssFilter().relaxed(content);
+ db.close();
+
+ label = new Label("label", safeContent);
+ label.setEscapeModelStrings(false);
+
+ tLabel = app().tickets().getLabel(repository, labelItem.getModelObject());
+ }
+
String background = MessageFormat.format("background-color:{0};", tLabel.color);
label.add(new SimpleAttributeModifier("style", background));
labelItem.add(label);
--
Gitblit v1.9.1