[gatein-commits] gatein SVN: r5085 - in portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui: page and 1 other directory.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2010-11-14 23:37:32 -0500 (Sun, 14 Nov 2010)
New Revision: 5085

Modified:
   portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
   portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-1631 Navigation drop down menu is not updated when a page is deleted.

Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java	2010-11-15 00:32:28 UTC (rev 5084)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java	2010-11-15 04:37:32 UTC (rev 5085)
@@ -367,6 +367,12 @@
       }
 
       PageNode cloneStartNode = startNode.clone();
+
+      // Check if page reference isn't existing, page reference value of node is setted null too.
+      if (pageReference != null && userService.getPage(pageReference) == null)
+      {
+         cloneStartNode.setPageReference(null);         
+      }
       ArrayList<PageNode> filteredChildren = new ArrayList<PageNode>();
 
       List<PageNode> children = startNode.getChildren();

Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java	2010-11-15 00:32:28 UTC (rev 5084)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java	2010-11-15 04:37:32 UTC (rev 5085)
@@ -309,6 +309,12 @@
          if(page.getOwnerType().equals(PortalConfig.USER_TYPE)){
             removePageNode(page, event);
          }
+
+         UIWorkingWorkspace uiWorkingWorkspace = uiPortalApp.getChild(UIWorkingWorkspace.class);
+         uiWorkingWorkspace.updatePortletsByName("UserToolbarSitePortlet");
+         uiWorkingWorkspace.updatePortletsByName("UserToolbarGroupPortlet");
+         uiWorkingWorkspace.updatePortletsByName("UserToolbarDashboardPortlet");
+         uiWorkingWorkspace.updatePortletsByName("NavigationPortlet");
       }
       
       /**