diff options
Diffstat (limited to 'src/main/java/com/gitblit/tickets/TicketNotifier.java')
| -rw-r--r-- | src/main/java/com/gitblit/tickets/TicketNotifier.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java index 07371b1b..5979cf26 100644 --- a/src/main/java/com/gitblit/tickets/TicketNotifier.java +++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java @@ -135,6 +135,7 @@ public class TicketNotifier { 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 @@ public class TicketNotifier { // 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 @@ public class TicketNotifier { 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; |