From 57a71dee29f286c7d840fdfcc0b2d98c07f29034 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 09 Mar 2014 13:04:59 -0400
Subject: [PATCH] Mirrors and read-only repositories must disable review function
---
src/main/java/com/gitblit/tickets/TicketNotifier.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 998461e..6ff76de 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -213,6 +213,9 @@
// new proposal
pattern = "**{0}** is proposing a change.";
sb.append(MessageFormat.format(pattern, user.getDisplayName()));
+ fieldExclusions.add(Field.status);
+ fieldExclusions.add(Field.title);
+ fieldExclusions.add(Field.body);
} else {
// describe the patchset
if (patchset.isFF()) {
@@ -486,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;
}
@@ -520,7 +524,7 @@
Set<String> toAddresses = new TreeSet<String>();
for (String name : ticket.getParticipants()) {
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);
@@ -558,7 +562,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