From 1f5fe41383072a18e4eaac05b035c87250a6576e Mon Sep 17 00:00:00 2001
From: Olivier Dagenais <olivier.dagenais@gmail.com>
Date: Tue, 22 Oct 2013 14:52:51 -0400
Subject: [PATCH] Enhance the current user link in the header.

1 - Link to user's ID, which is properly escaped.
2 - Display user's full name if possible, otherwise their ID.
---
 core/src/main/resources/lib/layout/layout.jelly | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 49c91300a8..804479d4cf 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -173,8 +173,17 @@ ${h.initPageVariables(context)}
                 <st:nbsp/>
                 <j:choose>
                   <j:when test="${!h.isAnonymous()}">
+                    <j:set var="user" value="${app.getUser(app.authentication.name)}"/>
+                    <j:choose>
+                      <j:when test="${user.fullName == null || user.fullName.trim().isEmpty()}">
+                        <j:set var="userName" value="${user.id}"/>
+                      </j:when>
+                      <j:otherwise>
+                        <j:set var="userName" value="${user.fullName}"/>
+                      </j:otherwise>
+                    </j:choose>
                     <span style="white-space:nowrap">
-                      <a href="${rootURL}/user/${app.authentication.name}" class="model-link inside"><b>${app.authentication.name}</b></a>
+                      <a href="${rootURL}/user/${user.id}" class="model-link inside"><b>${userName}</b></a>
                       <j:if test="${app.securityRealm.canLogOut()}">
                         |
                         <a href="${rootURL}/logout"><b>${%logout}</b></a>
-- 
GitLab