From 2c72d89671e0a6db473e557f0befc6c62d3b32d9 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Wed, 14 Jun 2017 12:10:28 +0200
Subject: [PATCH] OO-2819 use user display name instead of username in
participant folder notifications
---
.../org/olat/course/nodes/pf/manager/PFNotifications.java | 8 ++++++--
.../course/nodes/pf/manager/PFNotificationsHandler.java | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/pf/manager/PFNotifications.java b/src/main/java/org/olat/course/nodes/pf/manager/PFNotifications.java
index 761b131c0f1..8658903c8da 100644
--- a/src/main/java/org/olat/course/nodes/pf/manager/PFNotifications.java
+++ b/src/main/java/org/olat/course/nodes/pf/manager/PFNotifications.java
@@ -50,6 +50,7 @@ import org.olat.course.nodes.CourseNode;
import org.olat.course.nodes.pf.ui.PFRunController;
import org.olat.course.run.environment.CourseEnvironment;
import org.olat.repository.RepositoryEntry;
+import org.olat.user.UserManager;
/**
*
* Initial date: 05.01.2017<br>
@@ -70,13 +71,15 @@ public class PFNotifications {
private NotificationsManager notificationsManager;
private PFManager pfManager;
+ private UserManager userManager;
public PFNotifications(Subscriber subscriber, Locale locale, Date compareDate, PFManager pfManager,
- NotificationsManager notificationsManager) {
+ NotificationsManager notificationsManager,UserManager userManager) {
this.subscriber = subscriber;
this.compareDate = compareDate;
this.notificationsManager = notificationsManager;
this.pfManager = pfManager;
+ this.userManager = userManager;
translator = Util.createPackageTranslator(PFRunController.class, locale);
}
@@ -135,8 +138,9 @@ public class PFNotifications {
String forby = translator.translate("notifications.entry." +
(filePath.contains(PFManager.FILENAME_DROPBOX) ? "by" : "for"));
+ String userDisplayName = userManager.getUserDisplayName(participant);
String desc = translator.translate("notifications.entry." + action,
- new String[] { filePath, forby, participant.getName() });
+ new String[] { filePath, forby, userDisplayName});
String businessPath = p.getBusinessPath();
String urlToSend = BusinessControlFactory.getInstance()
.getURLFromBusinessPathString(businessPath);
diff --git a/src/main/java/org/olat/course/nodes/pf/manager/PFNotificationsHandler.java b/src/main/java/org/olat/course/nodes/pf/manager/PFNotificationsHandler.java
index a13852ea4ad..68acc00fbbe 100644
--- a/src/main/java/org/olat/course/nodes/pf/manager/PFNotificationsHandler.java
+++ b/src/main/java/org/olat/course/nodes/pf/manager/PFNotificationsHandler.java
@@ -45,6 +45,7 @@ import org.olat.course.run.environment.CourseEnvironment;
import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupService;
import org.olat.repository.RepositoryManager;
+import org.olat.user.UserManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -63,6 +64,8 @@ public class PFNotificationsHandler implements NotificationsHandler {
private NotificationsManager notificationsManager;
@Autowired
private PFManager pfManager;
+ @Autowired
+ private UserManager userManager;
public PFNotificationsHandler() {
@@ -81,7 +84,7 @@ public class PFNotificationsHandler implements NotificationsHandler {
final Translator translator = Util.createPackageTranslator(PFRunController.class, locale);
PFNotifications notifications = new PFNotifications(subscriber, locale, compareDate,
- pfManager, notificationsManager);
+ pfManager, notificationsManager, userManager);
List<SubscriptionListItem> items = notifications.getItems();
if (items.isEmpty()) {
--
GitLab