Author: kien_nguyen Date: 2011-01-04 23:57:05 -0500 (Tue, 04 Jan 2011) New Revision: 5678 Modified: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java Log: WEBOS-386 Error after edit a Desktop page via Page management Modified: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-01-04 12:48:43 UTC (rev 5677) +++ exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-01-05 04:57:05 UTC (rev 5678) @@ -431,6 +431,8 @@ UIPageBrowser.msg.NotViewPage=You have not the rights to view this page. UIPageBrowser.msg.edit.NotEditPage=You have not the rights to edit this page. UIPageBrowser.msg.delete.NotDelete=You have not the rights to delete this page. +UIPageBrowser.msg.edit.NotEditDesktopPage=Don't allow edit a desktop page here. +UIPageBrowser.msg.delete.NotDeleteDesktopPage=A desktop page can not be deleted. UIPageBrowser.selectItem.ownerType=Owner Type UIPageBrowser.selectItem.ownerId=Owner Id UIPageBrowser.selectItem.name=Name Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-04 12:48:43 UTC (rev 5677) +++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-01-05 04:57:05 UTC (rev 5678) @@ -266,13 +266,20 @@ return; } Page page = service.getPage(id, pcontext.getRemoteUser()); + if (page != null && page.getName().equals("webos")) + { + uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.delete.NotDeleteDesktopPage", new String[]{id}, 1)); + pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + return; + } + if (page == null || !page.isModifiable()) { uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.delete.NotDelete", new String[]{id}, 1)); pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; } - + UIVirtualList virtualList = uiPageBrowser.getChild(UIVirtualList.class); UIRepeater repeater = (UIRepeater)virtualList.getDataFeed(); PageListAccess datasource = (PageListAccess)repeater.getDataSource(); @@ -398,6 +405,13 @@ pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; } + + if (page.getName().equals("webos")) + { + uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.edit.NotEditDesktopPage", new String[]{id}, 1)); + pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); + return; + } //Check current user 's permissions on the page UserACL userACL = uiPageBrowser.getApplicationComponent(UserACL.class); @@ -407,7 +421,7 @@ pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages()); return; } - + //Switch portal application to edit mode uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); UIWorkingWorkspace uiWorkingWS = uiPortalApp.findFirstComponentOfType(UIWorkingWorkspace.class); @@ -421,17 +435,6 @@ if (uiPageBody.getUIComponent() != null) uiPageBody.setUIComponent(null); - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - UIMaskWorkspace uiMaskWS = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - UIPageForm uiPageForm = uiMaskWS.createUIComponent(UIPageForm.class, "UIBrowserPageForm", "UIPageForm"); - uiPageForm.setValues(uiPage); - uiMaskWS.setUIComponent(uiPageForm); - uiMaskWS.setShow(true); - pcontext.addUIComponentToUpdateByAjax(uiMaskWS); - return; - } - editInlineWS.setRendered(true); editInlineWS.setUIComponent(uiPage);