From ea7006007b09b4356249f68c70a0ede38888d5ec Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Tue, 26 Feb 2019 10:49:14 +0100
Subject: [PATCH] EHN: multiple email addresses for curators
---
.../server/jobs/extension/AWIBoxLoanCuratorEmail.java | 9 +++++++++
.../extension/AWIBoxLoanRequestLoanCuratorEmail.java | 3 +--
.../extension/AWIBoxLoanRequestReturnCuratorEmail.java | 6 +++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java
index 4e024ec1..73092a97 100644
--- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java
+++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanCuratorEmail.java
@@ -8,6 +8,8 @@ import caosdb.server.datatype.SingleValue;
import caosdb.server.datatype.Value;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.wrapper.Property;
+import caosdb.server.utils.mail.Mail;
+
import java.util.TimeZone;
public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel {
@@ -81,4 +83,11 @@ public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel {
}
return s.toString();
}
+
+ protected void sendCuratorEmail(String body, String subject) {
+ for (String addr : CURATOR_EMAIL.split(" ")) {
+ Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, addr, subject, body);
+ m.send();
+ }
+ }
}
diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java
index 6d251eb8..74302f4f 100644
--- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java
+++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestLoanCuratorEmail.java
@@ -19,8 +19,7 @@ public class AWIBoxLoanRequestLoanCuratorEmail extends AWIBoxLoanCuratorEmail {
body.append("\n");
body.append(loanToString(e));
}
- Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, CURATOR_EMAIL, SUBJECT, body.toString());
- m.send();
+ this.sendCuratorEmail(body.toString(), SUBJECT);
}
}
}
diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java
index ace70773..fd3f3485 100644
--- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java
+++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoanRequestReturnCuratorEmail.java
@@ -3,7 +3,6 @@ package caosdb.server.jobs.extension;
import caosdb.server.entity.EntityInterface;
import caosdb.server.jobs.JobAnnotation;
import caosdb.server.jobs.JobExecutionTime;
-import caosdb.server.utils.mail.Mail;
@JobAnnotation(time = JobExecutionTime.POST_TRANSACTION)
public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail {
@@ -17,8 +16,9 @@ public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail
body.append("\n");
body.append(loanToString(e));
}
- Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, CURATOR_EMAIL, SUBJECT, body.toString());
- m.send();
+ this.sendCuratorEmail(body.toString(), SUBJECT);
}
}
+
+
}
--
GitLab