From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Mar 2014 13:22:04 +0000 (-0400)
Subject: Repository owners were not CCd on ticket emails
X-Git-Tag: v1.4.1~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4261c190ab9f9483a00d1769e3916ec608ec5391;p=gitblit.git

Repository owners were not CCd on ticket emails
---

diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 6ff76def..48fe051f 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -520,9 +520,16 @@ public class TicketNotifier {
 
 		//
 		// 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 && !user.disabled) {
 				if (!StringUtils.isEmpty(user.emailAddress)) {
@@ -543,6 +550,11 @@ public class TicketNotifier {
 		//
 		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);
 		if (lastChange.hasComment()) {