Author: tan_pham_dinh Date: 2010-02-10 05:39:21 -0500 (Wed, 10 Feb 2010) New Revision: 1611 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-572: Still keep the change when click Abort button of Portal Composer Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 10:26:47 UTC (rev 1610) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 10:39:21 UTC (rev 1611) @@ -649,6 +649,7 @@ dataService.save(page); uiToolPanel.setUIComponent(null); + PortalDataMapper.toUIPage(uiPage, page); // Update UIPage cache on UIPortal uiPortal.setUIPage(pageId, uiPage); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-10 10:26:47 UTC (rev 1610) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-10 10:39:21 UTC (rev 1611) @@ -85,7 +85,9 @@ uiToolPanel.setShowMaskLayer(false); uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); - uiToolPanel.setWorkingComponent(pageBody.getUIComponent()); + UIPage newUIPage = new UIPage(); + PortalDataMapper.toUIPage(newUIPage, page); + uiToolPanel.setWorkingComponent(newUIPage); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); Util.getPortalRequestContext().setFullRender(true); }