From c5dfd60d174a9841e64e4097cecab5aea5c422d0 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 12 Apr 2014 12:26:17 -0400 Subject: [PATCH] Documentation --- src/main/java/com/gitblit/tickets/TicketNotifier.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java index a8ebc9e..48fe051 100644 --- a/src/main/java/com/gitblit/tickets/TicketNotifier.java +++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java @@ -489,6 +489,7 @@ instructions = instructions.replace("${ticketRef}", ticketBranch); instructions = instructions.replace("${patchsetRef}", patchsetBranch); instructions = instructions.replace("${reviewBranch}", reviewBranch); + instructions = instructions.replace("${ticketBranch}", ticketBranch); return instructions; } @@ -519,11 +520,18 @@ // // Direct TO recipients + // reporter & responsible // + Set<String> tos = new TreeSet<String>(); + tos.add(ticket.createdBy); + if (!StringUtils.isEmpty(ticket.responsible)) { + tos.add(ticket.responsible); + } + Set<String> toAddresses = new TreeSet<String>(); - for (String name : ticket.getParticipants()) { + for (String name : tos) { UserModel user = userManager.getUserModel(name); - if (user != null) { + if (user != null && !user.disabled) { if (!StringUtils.isEmpty(user.emailAddress)) { if (user.canView(repository)) { toAddresses.add(user.emailAddress); @@ -541,6 +549,11 @@ // CC recipients // Set<String> ccs = new TreeSet<String>(); + + // repository owners + if (!ArrayUtils.isEmpty(repository.owners)) { + tos.addAll(repository.owners); + } // cc users mentioned in last comment Change lastChange = ticket.changes.get(ticket.changes.size() - 1); @@ -561,7 +574,7 @@ Set<String> ccAddresses = new TreeSet<String>(); for (String name : ccs) { UserModel user = userManager.getUserModel(name); - if (user != null) { + if (user != null && !user.disabled) { if (!StringUtils.isEmpty(user.emailAddress)) { if (user.canView(repository)) { ccAddresses.add(user.emailAddress); -- Gitblit v1.9.1