[gatein-commits] gatein SVN: r3080 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directory.

[do-not-reply at jboss.org]

Author: hoang_to
Date: 2010-05-13 06:01:06 -0400 (Thu, 13 May 2010)
New Revision: 3080

Modified:
   portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
Log:
GTNPORTAL-1200: Have problem when add sub-node in portal navigation

Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java	2010-05-13 09:57:54 UTC (rev 3079)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java	2010-05-13 10:01:06 UTC (rev 3080)
@@ -28,6 +28,7 @@
 import org.exoplatform.portal.config.UserPortalConfig;
 import org.exoplatform.portal.config.UserPortalConfigService;
 import org.exoplatform.portal.config.model.PageNavigation;
+import org.exoplatform.portal.config.model.PageNode;
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
 import org.exoplatform.portal.webui.navigation.UINavigationManagement;
@@ -384,6 +385,12 @@
          selector.setEdittedNavigation(uiPageNodeForm.getContextPageNavigation());
          selector.initTreeData();
          
+         if (uiPageNodeForm.getSelectedParent() instanceof PageNode)
+         {
+            PageNode selectedParent = (PageNode)uiPageNodeForm.getSelectedParent();
+            selector.selectPageNodeByUri(selectedParent.getUri());
+         }
+         
          uiNavigationPopup.setUIComponent(navigationManager);
          uiNavigationPopup.setWindowSize(400, 400);
          event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java	2010-05-13 09:57:54 UTC (rev 3079)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java	2010-05-13 10:01:06 UTC (rev 3080)
@@ -28,6 +28,7 @@
 import org.exoplatform.portal.config.model.PageNode;
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
+import org.exoplatform.portal.webui.navigation.ParentChildPair;
 import org.exoplatform.portal.webui.portal.UIPortal;
 import org.exoplatform.portal.webui.util.Util;
 import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -72,6 +73,14 @@
 
    private Object selectedParent;
 
+   /**
+    * Wrapper of editted PageNode and its parent
+    */
+   private ParentChildPair contextParentChildPair;
+   
+   /**
+    * PageNavigation to which editted PageNode belongs
+    */
    private PageNavigation contextPageNavigation;
    
    final private static String SHOW_PUBLICATION_DATE = "showPublicationDate";
@@ -197,6 +206,16 @@
       this.selectedParent = obj;
    }
 
+   public void setContextParentChildPair(ParentChildPair _contextParentChildPair)
+   {
+      this.contextParentChildPair = _contextParentChildPair;
+   }
+   
+   public ParentChildPair getContextParentChildPair()
+   {
+      return this.contextParentChildPair;
+   }
+   
    public void processRender(WebuiRequestContext context) throws Exception
    {
       super.processRender(context);