Author: truong.le Date: 2009-12-04 01:53:15 -0500 (Fri, 04 Dec 2009) New Revision: 921 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java Log: GTNPORTAL-341: Unknown error when click portal properties in edit layout of group 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 2009-12-04 04:57:46 UTC (rev 920) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-12-04 06:53:15 UTC (rev 921) @@ -283,16 +283,29 @@ { UIComponent temp = null; UIPortal uiPortal = null; + String portalOwner = null; UIEditInlineWorkspace uiEditWS = event.getSource().getAncestorOfType(UIEditInlineWorkspace.class); temp = uiEditWS.getUIComponent(); if(temp != null && (temp instanceof UIPortal)) + { uiPortal = (UIPortal)temp; + if(uiPortal.getOwnerType().equals(PortalConfig.PORTAL_TYPE)) + { + portalOwner = uiPortal.getOwner(); + } + else + portalOwner = Util.getPortalRequestContext().getPortalOwner(); + } else + { uiPortal = Util.getUIPortal(); + portalOwner = Util.getPortalRequestContext().getPortalOwner(); + } + UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm"); - portalForm.setPortalOwner(uiPortal.getOwner()); + portalForm.setPortalOwner(portalOwner); portalForm.setBindingBean(); if(PortalConfig.USER_TYPE.equals(uiPortal.getOwnerType())){ portalForm.removeChildById("PermissionSetting");