From 2331e7936c27e32b7d6d251b3637efc0e1184a81 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Support admin commands that respect user permissions
---
src/main/java/com/gitblit/tickets/TicketNotifier.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 6ff76de..48fe051 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -520,9 +520,16 @@
//
// 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 @@
//
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()) {
--
Gitblit v1.9.1