Author: carlucci
Date: Fri Jul 27 18:57:11 2012
New Revision: 1366497
URL: http://svn.apache.org/viewvc?rev=1366497&view=rev
Log:
RAVE-556: User Display name empty. Patch submitted by Daniel Gornstein
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java?rev=1366497&r1=1366496&r2=1366497&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
Fri Jul 27 18:57:11 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.web.contr
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.web.model.NavigationItem;
import org.apache.rave.portal.web.model.NavigationMenu;
@@ -73,7 +72,7 @@ public class ControllerUtils {
public static NavigationMenu getTopMenu(String view, long referringPageId,
User user, boolean addStoreLink) {
NavigationMenu menu = new NavigationMenu("topnav");
if(view.startsWith(ViewNames.PAGE) ||
view.startsWith(ViewNames.MOBILE_HOME)) {
- NavigationItem profile = new NavigationItem("page.profile.title",
user.getDisplayName() != null ? user.getDisplayName() : user.getUsername(),
"/app/person/" + user.getUsername() + "?referringPageId=" + referringPageId);
+ NavigationItem profile = new NavigationItem("page.profile.title",
getDisplayName(user), "/app/person/" + user.getUsername() + "?referringPageId="
+ referringPageId);
menu.addNavigationItem(profile);
if(addStoreLink){
@@ -124,6 +123,11 @@ public class ControllerUtils {
return menu;
}
+ public static String getDisplayName(User user) {
+ String displayName = user.getDisplayName();
+ return (displayName == null || "".equals(displayName)) ?
user.getUsername() : displayName;
+ }
+
private static NavigationItem getBackItem(long referringPageId) {
NavigationItem back = new NavigationItem();
back.setName("page.general.back");
@@ -142,4 +146,4 @@ public class ControllerUtils {
private static NavigationItem getLogoutItem() {
return new NavigationItem("page.general.logout", null,
"/j_spring_security_logout");
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java?rev=1366497&r1=1366496&r2=1366497&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
(original)
+++
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
Fri Jul 27 18:57:11 2012
@@ -18,6 +18,8 @@
*/
package org.apache.rave.portal.web.controller.util;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mobile.device.DeviceResolver;
@@ -26,16 +28,19 @@ import org.springframework.mobile.device
import org.springframework.mock.web.MockHttpServletRequest;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
public class ControllerUtilsTest {
private MockHttpServletRequest request;
private DeviceResolver deviceResolver;
+ private User user;
@Before
public void setUp() {
request = new MockHttpServletRequest();
deviceResolver = new LiteDeviceResolver();
+ user = new UserImpl();
+ user.setDisplayName("Test");
}
@Test
@@ -69,4 +74,23 @@ public class ControllerUtilsTest {
request.setAttribute(DeviceUtils.CURRENT_DEVICE_ATTRIBUTE,
deviceResolver.resolveDevice(request));
assertThat(ControllerUtils.getDeviceAppropriateView(request,
defaultView, mobileView), is(mobileView));
}
+
+ @Test
+ public void getDisplayName_withDisplayName(){
+ assertEquals(user.getDisplayName(),
ControllerUtils.getDisplayName(user));
+ }
+
+ @Test
+ public void getDisplayName_withoutDisplayName(){
+ user.setDisplayName("");
+ user.setUsername("username");
+ assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+ }
+
+ @Test
+ public void getDisplayName_withNullDisplayName(){
+ user.setDisplayName(null);
+ user.setUsername("username");
+ assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+ }
}
\ No newline at end of file
