Skip to content
Snippets Groups Projects
Commit 2c72d896 authored by gnaegi's avatar gnaegi
Browse files

OO-2819 use user display name instead of username in participant folder notifications

parent 32f710a8
No related branches found
No related tags found
No related merge requests found
...@@ -50,6 +50,7 @@ import org.olat.course.nodes.CourseNode; ...@@ -50,6 +50,7 @@ import org.olat.course.nodes.CourseNode;
import org.olat.course.nodes.pf.ui.PFRunController; import org.olat.course.nodes.pf.ui.PFRunController;
import org.olat.course.run.environment.CourseEnvironment; import org.olat.course.run.environment.CourseEnvironment;
import org.olat.repository.RepositoryEntry; import org.olat.repository.RepositoryEntry;
import org.olat.user.UserManager;
/** /**
* *
* Initial date: 05.01.2017<br> * Initial date: 05.01.2017<br>
...@@ -70,13 +71,15 @@ public class PFNotifications { ...@@ -70,13 +71,15 @@ public class PFNotifications {
private NotificationsManager notificationsManager; private NotificationsManager notificationsManager;
private PFManager pfManager; private PFManager pfManager;
private UserManager userManager;
public PFNotifications(Subscriber subscriber, Locale locale, Date compareDate, PFManager pfManager, public PFNotifications(Subscriber subscriber, Locale locale, Date compareDate, PFManager pfManager,
NotificationsManager notificationsManager) { NotificationsManager notificationsManager,UserManager userManager) {
this.subscriber = subscriber; this.subscriber = subscriber;
this.compareDate = compareDate; this.compareDate = compareDate;
this.notificationsManager = notificationsManager; this.notificationsManager = notificationsManager;
this.pfManager = pfManager; this.pfManager = pfManager;
this.userManager = userManager;
translator = Util.createPackageTranslator(PFRunController.class, locale); translator = Util.createPackageTranslator(PFRunController.class, locale);
} }
...@@ -135,8 +138,9 @@ public class PFNotifications { ...@@ -135,8 +138,9 @@ public class PFNotifications {
String forby = translator.translate("notifications.entry." + String forby = translator.translate("notifications.entry." +
(filePath.contains(PFManager.FILENAME_DROPBOX) ? "by" : "for")); (filePath.contains(PFManager.FILENAME_DROPBOX) ? "by" : "for"));
String userDisplayName = userManager.getUserDisplayName(participant);
String desc = translator.translate("notifications.entry." + action, String desc = translator.translate("notifications.entry." + action,
new String[] { filePath, forby, participant.getName() }); new String[] { filePath, forby, userDisplayName});
String businessPath = p.getBusinessPath(); String businessPath = p.getBusinessPath();
String urlToSend = BusinessControlFactory.getInstance() String urlToSend = BusinessControlFactory.getInstance()
.getURLFromBusinessPathString(businessPath); .getURLFromBusinessPathString(businessPath);
......
...@@ -45,6 +45,7 @@ import org.olat.course.run.environment.CourseEnvironment; ...@@ -45,6 +45,7 @@ import org.olat.course.run.environment.CourseEnvironment;
import org.olat.group.BusinessGroup; import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupService; import org.olat.group.BusinessGroupService;
import org.olat.repository.RepositoryManager; import org.olat.repository.RepositoryManager;
import org.olat.user.UserManager;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -63,6 +64,8 @@ public class PFNotificationsHandler implements NotificationsHandler { ...@@ -63,6 +64,8 @@ public class PFNotificationsHandler implements NotificationsHandler {
private NotificationsManager notificationsManager; private NotificationsManager notificationsManager;
@Autowired @Autowired
private PFManager pfManager; private PFManager pfManager;
@Autowired
private UserManager userManager;
public PFNotificationsHandler() { public PFNotificationsHandler() {
...@@ -81,7 +84,7 @@ public class PFNotificationsHandler implements NotificationsHandler { ...@@ -81,7 +84,7 @@ public class PFNotificationsHandler implements NotificationsHandler {
final Translator translator = Util.createPackageTranslator(PFRunController.class, locale); final Translator translator = Util.createPackageTranslator(PFRunController.class, locale);
PFNotifications notifications = new PFNotifications(subscriber, locale, compareDate, PFNotifications notifications = new PFNotifications(subscriber, locale, compareDate,
pfManager, notificationsManager); pfManager, notificationsManager, userManager);
List<SubscriptionListItem> items = notifications.getItems(); List<SubscriptionListItem> items = notifications.getItems();
if (items.isEmpty()) { if (items.isEmpty()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment