From 7b740682bbf99f8d6ee0bfdd641e2d07587b8273 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 24 Feb 2014 11:18:39 +0100
Subject: [PATCH] OO-993: fix RS in the user delete workflow if the "copy the
sender" is selected
---
.../org/olat/admin/user/delete/SelectionController.java | 6 +++---
.../olat/admin/user/delete/service/UserDeletionManager.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/delete/SelectionController.java b/src/main/java/org/olat/admin/user/delete/SelectionController.java
index 2e436db1448..599a766be12 100644
--- a/src/main/java/org/olat/admin/user/delete/SelectionController.java
+++ b/src/main/java/org/olat/admin/user/delete/SelectionController.java
@@ -199,9 +199,9 @@ public class SelectionController extends BasicController {
}
private void handleEmailButtonEvent(UserRequest ureq, TableMultiSelectEvent tmse) {
- if (tdm.getObjects(tmse.getSelection()).size() != 0) {
- selectedIdentities = tdm.getObjects(tmse.getSelection());
-
+ List<Identity> identities = tdm.getObjects(tmse.getSelection());
+ if (identities.size() > 0) {
+ selectedIdentities = identities;
MailTemplate deleteMailTemplate = createMailTemplate(translate(KEY_EMAIL_SUBJECT), translate(KEY_EMAIL_BODY));
deleteMailTemplate.addToContext("lastloginduration", Integer.toString(UserDeletionManager.getInstance().getLastLoginDuration() ));
deleteMailTemplate.addToContext("durationdeleteemail", Integer.toString(UserDeletionManager.getInstance().getDeleteEmailDuration() ));
diff --git a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
index 5355397c897..4f7a559904b 100644
--- a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
+++ b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java
@@ -154,7 +154,6 @@ public class UserDeletionManager extends BasicManager {
}
template.putVariablesInMailContext(template.getContext(), identity);
logDebug(" Try to send Delete-email to identity=" + identity.getName() + " with email=" + identity.getUser().getProperty(UserConstants.EMAIL, null));
- Identity ccIdentity = null;
MailerResult result = new MailerResult();
MailBundle bundle = mailManager.makeMailBundle(null, identity, template, sender, null, result);
@@ -162,7 +161,7 @@ public class UserDeletionManager extends BasicManager {
mailManager.sendMessage(bundle);
}
if(template.getCpfrom()) {
- MailBundle ccBundle = mailManager.makeMailBundle(null, ccIdentity, template, sender, null, result);
+ MailBundle ccBundle = mailManager.makeMailBundle(null, sender, template, sender, null, result);
if(ccBundle != null) {
mailManager.sendMessage(ccBundle);
}
--
GitLab