Author: truong.le Date: 2009-12-18 03:12:18 -0500 (Fri, 18 Dec 2009) New Revision: 1059 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java Log: GTNPORTAL-330: Nothing happen after change language/skin of portal in Edit layout It should be kept previous portal props when view "portal properties" from Portal Composer Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-12-18 06:55:50 UTC (rev 1058) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-12-18 08:12:18 UTC (rev 1059) @@ -142,9 +142,22 @@ UserPortalConfigService service = this.getApplicationComponent(UserPortalConfigService.class); PortalRequestContext prContext = Util.getPortalRequestContext(); - UserPortalConfig userConfig = service.getUserPortalConfig(getPortalOwner(), prContext.getRemoteUser()); - UIPortal editPortal = this.createUIComponent(UIPortal.class, null, null); - PortalDataMapper.toUIPortal(editPortal, userConfig); + UIPortal editPortal = null; + UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + UIEditInlineWorkspace uiEditWS = uiPortalApp.<UIWorkingWorkspace>getChildById(UIPortalApplication.UI_WORKING_WS_ID). + getChild(UIEditInlineWorkspace.class); + if(uiPortalApp.getModeState() != UIPortalApplication.NORMAL_MODE && + uiEditWS != null && uiEditWS.getUIComponent() != null && + (uiEditWS.getUIComponent() instanceof UIPortal)) + { + editPortal = (UIPortal)uiEditWS.getUIComponent(); + } + else + { + UserPortalConfig userConfig = service.getUserPortalConfig(getPortalOwner(), prContext.getRemoteUser()); + editPortal = this.createUIComponent(UIPortal.class, null, null); + PortalDataMapper.toUIPortal(editPortal, userConfig); + } invokeGetBindingBean(editPortal); ((UIFormStringInput)getChild(UIFormInputSet.class).getChildById(FIELD_NAME))