From 0756aac8b0e40855d027d446d5e9b3d8b18e28f8 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 9 Jun 2011 16:28:35 +0000
Subject: [PATCH] NIHVIVO-2684 If first name and last name are both empty,
 display the emailAddress.

---
 .../vitro/webapp/web/templatemodels/User.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
index 7600fc41c..e533847e5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
@@ -28,8 +28,17 @@ public class User extends BaseTemplateModel {
     }
     
     public String getLoginName() {
-		return (currentUser == null) ? ""
-				: (currentUser.getFirstName() + " " + currentUser.getLastName());
+    	if (currentUser == null) {
+    		return "";
+    	} 
+
+    	String firstName = currentUser.getFirstName();
+		String lastName = currentUser.getLastName();
+		if (firstName.isEmpty() && lastName.isEmpty()) {
+			return currentUser.getEmailAddress();
+		}
+		
+		return firstName + " " + lastName;
     }
     
     public boolean getHasSiteAdminAccess() {