Author: tan_pham_dinh
Date: 2010-03-01 03:10:40 -0500 (Mon, 01 Mar 2010)
New Revision: 1911
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
GTNPORTAL-701: Incorrect rendering if the going to the portal url while viewing some
portal pages
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-01
07:25:55 UTC (rev 1910)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01
08:10:40 UTC (rev 1911)
@@ -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();
@@ -91,6 +89,9 @@
if(targetedNav == null)
{
+ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+ uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
+ pcontext.setFullRender(true);
return;
}
@@ -118,6 +119,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)
{
Show replies by date