James Moger
2014-09-25 bfc22d47158b685ff8c6a686faf0f213a65fa0e1
Merged #186 "Support email subject-line links"
1 files added
1 files modified
21 ■■■■■ changed files
src/main/java/com/gitblit/tickets/TicketNotifier.java 9 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/tickets/viewTicket.html 12 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -135,6 +135,7 @@
            StringBuilder html = new StringBuilder();
            html.append("<head>");
            html.append(readStyle());
            html.append(readViewTicketAction(ticket));
            html.append("</head>");
            html.append("<body>");
            html.append(MarkdownUtils.transformGFM(settings, markdown, ticket.repository));
@@ -596,7 +597,7 @@
        // respect the author's email preference
        UserModel lastAuthor = userManager.getUserModel(lastChange.author);
        if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
        if (lastAuthor != null && !lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
            toAddresses.remove(lastAuthor.emailAddress);
            ccAddresses.remove(lastAuthor.emailAddress);
        }
@@ -613,6 +614,12 @@
        return sb.toString();
    }
    protected String readViewTicketAction(TicketModel ticket) {
        String action = readResource("viewTicket.html");
        action = action.replace("${url}", ticketService.getTicketUrl(ticket));
        return action;
    }
    protected String readResource(String resource) {
        StringBuilder sb = new StringBuilder();
        InputStream is = null;
src/main/java/com/gitblit/tickets/viewTicket.html
New file
@@ -0,0 +1,12 @@
<script type="application/ld+json">
{
  "@context": "http://schema.org",
  "@type": "EmailMessage",
  "description": "View this Ticket in Gitblit",
  "action": {
    "@type": "ViewAction",
    "url": "${url}",
    "name": "View Ticket"
  }
}
</script>