[gatein-commits] gatein SVN: r753 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.

[do-not-reply at jboss.org]

Author: truong.le
Date: 2009-11-22 22:14:40 -0500 (Sun, 22 Nov 2009)
New Revision: 753

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-273: Still edit navigation of portal which was deleted

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java	2009-11-23 03:12:32 UTC (rev 752)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java	2009-11-23 03:14:40 UTC (rev 753)
@@ -95,7 +95,11 @@
          UserPortalConfigService portalConfigService =
             uiManagement.getApplicationComponent(UserPortalConfigService.class);
          PageNavigation navigation = uiNodeSelector.getSelectedNavigation();
-         portalConfigService.update(navigation);
+         List<String> allPortalNames = portalConfigService.getAllPortalNames();
+         if(allPortalNames.contains(navigation.getOwnerId()))
+         {
+            portalConfigService.update(navigation);
+         }         
          UIPortal uiPortal = Util.getUIPortal();
          setNavigation(uiPortal.getNavigations(), navigation);
          UIPopupWindow uiPopup = uiManagement.getParent();

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java	2009-11-23 03:12:32 UTC (rev 752)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java	2009-11-23 03:14:40 UTC (rev 753)
@@ -495,7 +495,8 @@
          }
          else
          {
-            throw new Exception("Page don't exist!");
+            uiApp.addMessage(new ApplicationMessage("UIPageNodeSelector.msg.notAvailable", null));
+            return;
          }
       }
    }