From 7ef68c72fa7d36dd7e1b7f01f0b72559d7b767b9 Mon Sep 17 00:00:00 2001
From: Revi <git@revi-wm.tk>
Date: Thu, 26 Jun 2014 03:52:30 -0400
Subject: [PATCH] Fix translation
---
src/main/java/com/gitblit/tickets/TicketNotifier.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 9a5e4e1..07371b1 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -545,7 +545,6 @@
}
}
}
- mailing.setRecipients(toAddresses);
//
// CC recipients
@@ -554,7 +553,7 @@
// repository owners
if (!ArrayUtils.isEmpty(repository.owners)) {
- tos.addAll(repository.owners);
+ ccs.addAll(repository.owners);
}
// cc users mentioned in last comment
@@ -595,6 +594,14 @@
}
ccAddresses.addAll(settings.getStrings(Keys.mail.mailingLists));
+ // respect the author's email preference
+ UserModel lastAuthor = userManager.getUserModel(lastChange.author);
+ if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
+ toAddresses.remove(lastAuthor.emailAddress);
+ ccAddresses.remove(lastAuthor.emailAddress);
+ }
+
+ mailing.setRecipients(toAddresses);
mailing.setCCs(ccAddresses);
}
--
Gitblit v1.9.1