Author: liem_nguyen Date: 2010-02-25 23:43:52 -0500 (Thu, 25 Feb 2010) New Revision: 1873 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-768 unknown error when click edit layout of Dashboard 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-26 04:41:53 UTC (rev 1872) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-26 04:43:52 UTC (rev 1873) @@ -134,13 +134,15 @@ UIPortalApplication uiApp = Util.getUIPortalApplication(); UIPortal uiPortal = uiApp.getShowedUIPortal(); - + UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class); UserPortalConfig userConfig = service.getUserPortalConfig(uiPortal.getName(), event.getRequestContext().getRemoteUser()); - - PortalConfig portalConfig = userConfig.getPortalConfig(); + if (userConfig == null) + userConfig = uiApp.getUserPortalConfig(); + PortalConfig portalConfig = userConfig.getPortalConfig(); + UserACL userACL = uiPortal.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(portalConfig)) {