From a22eb4f5fdf2adeef9d7f9bfa0a72736ef4b0b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 26 Dec 2011 12:45:35 -0500
Subject: [PATCH] Added repository counts to filters menu
---
src/com/gitblit/GitBlit.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index f012279..a62d4e4 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -25,6 +25,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -743,8 +744,8 @@
"gitblit", null, "preReceiveScript")));
model.postReceiveScripts = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "postReceiveScript")));
- model.mailRecipients = new ArrayList<String>(Arrays.asList(config.getStringList(
- "gitblit", null, "mailRecipient")));
+ model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
+ "gitblit", null, "mailingList")));
}
r.close();
return model;
@@ -971,8 +972,8 @@
config.setStringList("gitblit", null, "postReceiveScript",
repository.postReceiveScripts);
}
- if (repository.mailRecipients != null) {
- config.setStringList("gitblit", null, "mailRecipient", repository.mailRecipients);
+ if (repository.mailingLists != null) {
+ config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
}
try {
config.save();
@@ -1478,6 +1479,30 @@
}
return scripts;
}
+
+ public List<String> getInheritedPreReceiveScripts(RepositoryModel repository) {
+ Set<String> globals = new HashSet<String>();
+ for (String script : getStrings(Keys.groovy.preReceiveScripts)) {
+ if (script.endsWith(".groovy")) {
+ globals.add(script.substring(0, script.lastIndexOf('.')));
+ } else {
+ globals.add(script);
+ }
+ }
+ return new ArrayList<String>(globals);
+ }
+
+ public List<String> getInheritedPostReceiveScripts(RepositoryModel repository) {
+ Set<String> globals = new HashSet<String>();
+ for (String script : getStrings(Keys.groovy.postReceiveScripts)) {
+ if (script.endsWith(".groovy")) {
+ globals.add(script.substring(0, script.lastIndexOf('.')));
+ } else {
+ globals.add(script);
+ }
+ }
+ return new ArrayList<String>(globals);
+ }
/**
* Notify the administrators by email.
@@ -1485,7 +1510,7 @@
* @param subject
* @param message
*/
- public void sendEmailToAdministrators(String subject, String message) {
+ public void sendMailToAdministrators(String subject, String message) {
try {
Message mail = mailExecutor.createMessageForAdministrators();
if (mail != null) {
@@ -1505,8 +1530,8 @@
* @param message
* @param toAddresses
*/
- public void sendEmail(String subject, String message, ArrayList<String> toAddresses) {
- this.sendEmail(subject, message, toAddresses.toArray(new String[0]));
+ public void sendMail(String subject, String message, Collection<String> toAddresses) {
+ this.sendMail(subject, message, toAddresses.toArray(new String[0]));
}
/**
@@ -1516,7 +1541,7 @@
* @param message
* @param toAddresses
*/
- public void sendEmail(String subject, String message, String... toAddresses) {
+ public void sendMail(String subject, String message, String... toAddresses) {
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
@@ -1634,11 +1659,7 @@
loginService = (IUserService) realmClass.newInstance();
}
} catch (Throwable t) {
- loginService = new UserServiceWrapper() {
- @Override
- public void setupService(IStoredSettings settings) {
- }
- };
+ loginService = new GitblitUserService();
}
setUserService(loginService);
mailExecutor = new MailExecutor(settings);
--
Gitblit v1.9.1