diff options
author | James Moger <james.moger@gitblit.com> | 2014-05-22 17:26:21 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-05-22 17:26:21 -0400 |
commit | d07b16755045eeb28f3802e610c67325481ad5bf (patch) | |
tree | 1e2000a084d38c4bf2dd23d8e56dc7b514e90a55 | |
parent | cbbb8ce91528e81d19d6eb150e9f2f61f0f098d2 (diff) | |
download | gitblit-d07b16755045eeb28f3802e610c67325481ad5bf.tar.gz gitblit-d07b16755045eeb28f3802e610c67325481ad5bf.zip |
Correct usage of bugtraq processor
-rw-r--r-- | src/main/java/com/gitblit/wicket/pages/TicketPage.java | 6 | ||||
-rw-r--r-- | src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java index c8ec2f8c..c282695b 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -278,7 +278,7 @@ public class TicketPage extends RepositoryPage { if (StringUtils.isEmpty(ticket.body)) {
desc = getString("gb.noDescriptionGiven");
} else {
- String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);
+ String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);
desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);
}
add(new Label("ticketDescription", desc).setEscapeModelStrings(false));
@@ -507,7 +507,7 @@ public class TicketPage extends RepositoryPage { add(new Label("ticketTopic").setVisible(false));
} else {
// process the topic using the bugtraq config to link things
- String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);
+ String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);
add(new Label("ticketTopic", topic).setEscapeModelStrings(false));
}
@@ -686,7 +686,7 @@ public class TicketPage extends RepositoryPage { /*
* COMMENT
*/
- String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, entry.comment.text);
+ String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);
String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);
Fragment frag = new Fragment("entry", "commentFragment", this);
Label commentIcon = new Label("commentIcon");
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java index ab763b8f..1ca483ce 100644 --- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java @@ -123,7 +123,7 @@ public class TicketListPanel extends BasePanel { 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); |