Skip to content
Snippets Groups Projects
Commit ea700600 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

EHN: multiple email addresses for curators

parent b1f94ab1
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,8 @@ import caosdb.server.datatype.SingleValue; ...@@ -8,6 +8,8 @@ import caosdb.server.datatype.SingleValue;
import caosdb.server.datatype.Value; import caosdb.server.datatype.Value;
import caosdb.server.entity.EntityInterface; import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.wrapper.Property; import caosdb.server.entity.wrapper.Property;
import caosdb.server.utils.mail.Mail;
import java.util.TimeZone; import java.util.TimeZone;
public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel { public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel {
...@@ -81,4 +83,11 @@ public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel { ...@@ -81,4 +83,11 @@ public abstract class AWIBoxLoanCuratorEmail extends AWIBoxLoanModel {
} }
return s.toString(); 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();
}
}
} }
...@@ -19,8 +19,7 @@ public class AWIBoxLoanRequestLoanCuratorEmail extends AWIBoxLoanCuratorEmail { ...@@ -19,8 +19,7 @@ public class AWIBoxLoanRequestLoanCuratorEmail extends AWIBoxLoanCuratorEmail {
body.append("\n"); body.append("\n");
body.append(loanToString(e)); body.append(loanToString(e));
} }
Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, CURATOR_EMAIL, SUBJECT, body.toString()); this.sendCuratorEmail(body.toString(), SUBJECT);
m.send();
} }
} }
} }
...@@ -3,7 +3,6 @@ package caosdb.server.jobs.extension; ...@@ -3,7 +3,6 @@ package caosdb.server.jobs.extension;
import caosdb.server.entity.EntityInterface; import caosdb.server.entity.EntityInterface;
import caosdb.server.jobs.JobAnnotation; import caosdb.server.jobs.JobAnnotation;
import caosdb.server.jobs.JobExecutionTime; import caosdb.server.jobs.JobExecutionTime;
import caosdb.server.utils.mail.Mail;
@JobAnnotation(time = JobExecutionTime.POST_TRANSACTION) @JobAnnotation(time = JobExecutionTime.POST_TRANSACTION)
public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail { public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail {
...@@ -17,8 +16,9 @@ public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail ...@@ -17,8 +16,9 @@ public class AWIBoxLoanRequestReturnCuratorEmail extends AWIBoxLoanCuratorEmail
body.append("\n"); body.append("\n");
body.append(loanToString(e)); body.append(loanToString(e));
} }
Mail m = new Mail(FROM_NAME, FROM_EMAIL, null, CURATOR_EMAIL, SUBJECT, body.toString()); this.sendCuratorEmail(body.toString(), SUBJECT);
m.send();
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment