svn commit: r1403916 - in /rave/trunk/rave-components/rave-web/src: main/java/org/apache/rave/portal/web/controller/ProfileController.java test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java

[cgeer]

Author: cgeer
Date: Tue Oct 30 22:58:40 2012
New Revision: 1403916

URL: http://svn.apache.org/viewvc?rev=1403916&view=rev
Log:
RAVE-840 Fix the profile page by adding the widget list that was dropped 
accidentally during the merge.

Modified:
    
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
    
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java

Modified: 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java?rev=1403916&r1=1403915&r2=1403916&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
 Tue Oct 30 22:58:40 2012
@@ -106,6 +106,17 @@ public class ProfileController {
     private String viewProfileCommon(User user, ModelMap model, String 
referringPageId){
         Page personProfilePage = 
pageService.getPersonProfilePage(user.getId());
         addAttributesToModel(model, user, referringPageId);
+
+        List<Widget> widgets = new ArrayList<Widget>();
+        if (personProfilePage.getRegions() != null) {
+            for(Region region : personProfilePage.getRegions()) {
+                for (RegionWidget regionWidget : region.getRegionWidgets()) {
+                    
widgets.add(widgetService.getWidget(regionWidget.getWidgetId()));
+                }
+            }
+        }
+        model.addAttribute(ModelKeys.WIDGETS, widgets);
+
         model.addAttribute(ModelKeys.PAGE, personProfilePage);
         String view =  
ViewNames.getPersonPageView(personProfilePage.getPageLayout().getCode());
         List<Person> friendRequests = 
userService.getFriendRequestsReceived(user.getUsername());

Modified: 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1403916&r1=1403915&r2=1403916&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
 Tue Oct 30 22:58:40 2012
@@ -98,7 +98,7 @@ public class ProfileControllerTest {
                //creating a mock user
                final UserImpl user = new UserImpl();
                final ModelMap model = new ModelMap();
-               final int modelSize = 4;
+               final int modelSize = 5;
                final String username="canonical";
         user.setUsername(username);
         user.setId(USER_ID);
@@ -139,7 +139,7 @@ public class ProfileControllerTest {
                //creating a mock user
                final UserImpl user = new UserImpl();
                final ModelMap model = new ModelMap();
-               final int modelSize = 4;
+               final int modelSize = 5;
                final String username="canonical";
         user.setUsername(username);
         user.setId(USER_ID);