James Moger
2014-05-22 d07b16755045eeb28f3802e610c67325481ad5bf
Correct usage of bugtraq processor
2 files modified
8 ■■■■ changed files
src/main/java/com/gitblit/wicket/pages/TicketPage.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -278,7 +278,7 @@
        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 @@
            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 @@
                        /*
                         * 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");
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -123,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);