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

[do-not-reply at jboss.org]

Author: tan_pham_dinh
Date: 2010-03-02 03:27:20 -0500 (Tue, 02 Mar 2010)
New Revision: 1923

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
- GTNPORTAL-701:Re-commit to fix rendering of portal when editting

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java	2010-03-02 07:09:02 UTC (rev 1922)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java	2010-03-02 08:27:20 UTC (rev 1923)
@@ -63,8 +63,6 @@
          UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
          PortalRequestContext pcontext = Util.getPortalRequestContext();
          pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
-         uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
-         pcontext.setFullRender(true);
 
          PageNavigation currentNav = showedUIPortal.getSelectedNavigation();
          String currentUri = showedUIPortal.getSelectedNode().getUri();
@@ -111,6 +109,7 @@
                showedUIPortal.setSelectedNode(targetPageNode);
                showedUIPortal.setSelectedPath(targetedPathNodes);
                showedUIPortal.refreshUIPage();
+               pcontext.setFullRender(true);
                return;
             }
          }
@@ -118,6 +117,9 @@
          {
             // Case 2: Either navigation type or id has been changed
             // First, we try to find a cached UIPortal
+            uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+            uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
+            pcontext.setFullRender(true);
             UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
             if (cachedUIPortal != null)
             {