From dbeb3710736e6d81042d8b1c69ae9817e23c9ea6 Mon Sep 17 00:00:00 2001
From: Tom Gross <itconsense@gmail.com>
Date: Mon, 2 Mar 2020 10:33:37 +0100
Subject: [PATCH] Simplify creation of name for display in footer
---
.../org/olat/gui/control/OlatFooterController.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/gui/control/OlatFooterController.java b/src/main/java/org/olat/gui/control/OlatFooterController.java
index 057ccf6681a..29df761002f 100644
--- a/src/main/java/org/olat/gui/control/OlatFooterController.java
+++ b/src/main/java/org/olat/gui/control/OlatFooterController.java
@@ -116,13 +116,11 @@ public class OlatFooterController extends BasicController implements LockableCon
// Push information about user
if (!isGuest && usess.isAuthenticated()) {
olatFootervc.contextPut("loggedIn", Boolean.TRUE);
- if(isInvitee) {
- String fullName = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(ureq.getIdentity());
- olatFootervc.contextPut("username", StringHelper.escapeHtml(fullName) + " " + translate("logged.in.invitee"));
- } else {
- String fullName = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(ureq.getIdentity());
- olatFootervc.contextPut("username", StringHelper.escapeHtml(fullName));
+ String fullName = StringHelper.escapeHtml(CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(ureq.getIdentity()));
+ if (isInvitee) {
+ fullName = fullName + " " + translate("logged.in.invitee");
}
+ olatFootervc.contextPut("username", fullName);
} else {
olatFootervc.contextPut("loggedIn", Boolean.FALSE);
}
--
GitLab