[gatein-commits] gatein SVN: r5106 - in exo/portal/branches/3.1.x/component/portal/src: test/java/org/exoplatform/portal/config and 1 other directory.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2010-11-16 07:23:34 -0500 (Tue, 16 Nov 2010)
New Revision: 5106

Modified:
   exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java
   exo/portal/branches/3.1.x/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
Log:
Allways show 'the page navigation for group already exists' although it was deleted

Modified: exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java
===================================================================
--- exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java	2010-11-16 11:53:34 UTC (rev 5105)
+++ exo/portal/branches/3.1.x/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java	2010-11-16 12:23:34 UTC (rev 5106)
@@ -154,8 +154,11 @@
    {
       GroupHandler groupHandler = orgService.getGroupHandler();
       Collection<String> descendantGroups = getDescendantGroups(group, groupHandler);
+      Collection<String> deletedNavigationGroups = new ArrayList<String>();
+      deletedNavigationGroups.addAll(descendantGroups);
+      deletedNavigationGroups.add(group.getId());
       PageNavigation navigation = null;
-      for (String childGroup : descendantGroups)
+      for (String childGroup : deletedNavigationGroups)
       {
          navigation = dataService.getPageNavigation(PortalConfig.GROUP_TYPE, childGroup);
          if (navigation != null)

Modified: exo/portal/branches/3.1.x/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
===================================================================
--- exo/portal/branches/3.1.x/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java	2010-11-16 11:53:34 UTC (rev 5105)
+++ exo/portal/branches/3.1.x/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java	2010-11-16 12:23:34 UTC (rev 5106)
@@ -127,6 +127,31 @@
       group = groupHandler.findGroupById("/groupTest");
       assertNull(group);
    }
+   
+   public void testGroupNavigation() throws Exception
+   {
+      GroupHandler groupHandler = org.getGroupHandler();
+      Group group = groupHandler.createGroupInstance();
+      group.setGroupName("testGroupNavigation");
+      group.setLabel("testGroupNavigation");
+      
+      groupHandler.addChild(null, group, true);
+      
+      PageNavigation pageNavigation = new PageNavigation();
+      pageNavigation.setOwnerId(group.getId());
+      pageNavigation.setOwnerType(PortalConfig.GROUP_TYPE);
+      storage.create(pageNavigation);
+      
+      pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId());
+      assertNotNull(pageNavigation);
+      
+      // Remove group
+      groupHandler.removeGroup(group, true);
+      
+      // Group navigations is removed after remove group 
+      pageNavigation = storage.getPageNavigation(PortalConfig.GROUP_TYPE, group.getId());
+      assertNull(pageNavigation);
+   }
 
    public void testUserLayout() throws Exception
    {