From 818841d155fb94da8f1d536c0af416149eb63f35 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 9 May 2017 14:00:19 +0200
Subject: [PATCH] OO-2740: remove the email of the person leaving the group
from the email to the person gaining access to it (patch S. Clemenz)
---
.../manager/BusinessGroupServiceImpl.java | 2 +-
.../java/org/olat/group/ui/BGMailHelper.java | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
index de911c43218..23bbd6bfc4c 100644
--- a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
+++ b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
@@ -1475,7 +1475,7 @@ public class BusinessGroupServiceImpl implements BusinessGroupService, UserDataD
mailing = new MailPackage(true);
}
- BusinessGroupMailing.sendEmail(ureqIdentity, firstWaitingListIdentity, group, MailType.graduateFromWaitingListToParticpant, mailing);
+ BusinessGroupMailing.sendEmail(null, firstWaitingListIdentity, group, MailType.graduateFromWaitingListToParticpant, mailing);
counter++;
}
}
diff --git a/src/main/java/org/olat/group/ui/BGMailHelper.java b/src/main/java/org/olat/group/ui/BGMailHelper.java
index e29acffcc06..c7d68019f25 100644
--- a/src/main/java/org/olat/group/ui/BGMailHelper.java
+++ b/src/main/java/org/olat/group/ui/BGMailHelper.java
@@ -192,13 +192,18 @@ public class BGMailHelper {
*/
private static MailTemplate createMailTemplate(BusinessGroupShort group, Identity actor, String subjectKey, String bodyKey) {
// get some data about the actor and fetch the translated subject / body via i18n module
- String[] bodyArgs = new String[] {
- actor.getUser().getProperty(UserConstants.FIRSTNAME, null),
- actor.getUser().getProperty(UserConstants.LASTNAME, null),
- actor.getUser().getProperty(UserConstants.EMAIL, null),
- actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties
- };
- Locale locale = I18nManager.getInstance().getLocaleOrDefault(actor.getUser().getPreferences().getLanguage());
+ String[] bodyArgs = null;
+ String lang = null;
+ if (actor != null) {
+ bodyArgs = new String[] {
+ actor.getUser().getProperty(UserConstants.FIRSTNAME, null),
+ actor.getUser().getProperty(UserConstants.LASTNAME, null),
+ actor.getUser().getProperty(UserConstants.EMAIL, null),
+ actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties
+ };
+ lang = actor.getUser().getPreferences().getLanguage();
+ }
+ Locale locale = I18nManager.getInstance().getLocaleOrDefault(lang);
Translator trans = Util.createPackageTranslator(BGMailHelper.class, locale,
Util.createPackageTranslator(BusinessGroupListController.class, locale));
String subject = trans.translate(subjectKey);
--
GitLab