Author: chris.laprun(a)jboss.com Date: 2010-03-01 07:31:01 -0500 (Mon, 01 Mar 2010) New Revision: 1912 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java Log: - GTNPORTAL-701: reverted changes as they seem to be causing issues. 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 08:10:40 UTC (rev 1911) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01 12:31:01 UTC (rev 1912) @@ -63,7 +63,9 @@ 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(); if(currentUri.startsWith("/")) @@ -89,9 +91,6 @@ if(targetedNav == null) { - uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); - pcontext.setFullRender(true); return; } @@ -119,9 +118,6 @@ { // 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) {