Merged #78 "Process bugtraq in the ticket description and comments"

James Moger

2014-05-15 032d8228dd61867c792c655e506aa8fae7026fd9

Merged #78 "Process bugtraq in the ticket description and comments"

 releases.moxie

@@ -22,6 +22,7 @@
    - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67)
    - Update the Korean translation (pr-184, ticket-69)
    - Overhaul the EmptyRepositoryPage (ticket-73)
    - Process bugtraq links in the ticket description and comments (ticket-78)
    additions:
    - Add My Tickets page (issue-215, ticket-15)
    - Added CRUD functionality for Ticket Milestones (ticket-17)

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -278,7 +278,8 @@
        if (StringUtils.isEmpty(ticket.body)) {

            desc = getString("gb.noDescriptionGiven");

        } else {

            desc = MarkdownUtils.transformGFM(app().settings(), ticket.body, ticket.repository);

            String bugtraq = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.body);

            desc = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);

        }

        add(new Label("ticketDescription", desc).setEscapeModelStrings(false));



@@ -685,7 +686,8 @@
                        /*

                         * COMMENT

                         */

                        String comment = MarkdownUtils.transformGFM(app().settings(), entry.comment.text, repositoryName);

                        String bugtraq = bugtraqProcessor().processPlainCommitMessage(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");

                        if (entry.comment.src == CommentSource.Email) {