From b6aa9a34e274bb72cced7ee1501a36ca52f07af9 Mon Sep 17 00:00:00 2001
From: "bhill6@wisc.edu" <bhill6@wisc.edu>
Date: Fri, 3 Mar 2017 13:50:32 -0600
Subject: [PATCH] Setting UwframeSession to use fullName as display name if
displayName is null. Previously always used fullName, but recent commit set
it to always use displayName. This commit splits the difference.
---
.../main/java/edu/wisc/uwss/web/uwframe/UwframeSession.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/uw-spring-security-web/src/main/java/edu/wisc/uwss/web/uwframe/UwframeSession.java b/uw-spring-security-web/src/main/java/edu/wisc/uwss/web/uwframe/UwframeSession.java
index bd4c9e1..0e61c6e 100644
--- a/uw-spring-security-web/src/main/java/edu/wisc/uwss/web/uwframe/UwframeSession.java
+++ b/uw-spring-security-web/src/main/java/edu/wisc/uwss/web/uwframe/UwframeSession.java
@@ -60,7 +60,8 @@ public class UwframeSession {
* @param userDetails
*/
public UwframeSession(Environment environment, UWUserDetails userDetails) {
- this(environment, userDetails.getUsername(), userDetails.getDisplayName(), userDetails.getFirstName(), userDetails.getLastName());
+ this(environment, userDetails.getUsername(), userDetails.getDisplayName()!=null ? userDetails.getDisplayName() : userDetails.getFullName(),
+ userDetails.getFirstName(), userDetails.getLastName());
}
/**
*
--
GitLab