Author: thomas.heute(a)jboss.com Date: 2007-11-29 20:24:27 -0500 (Thu, 29 Nov 2007) New Revision: 9211 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: JBPORTAL-1824 admin console: problem with deletion (portlet,page) and browser back button Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-11-29 23:40:15 UTC (rev 9210) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-11-30 01:24:27 UTC (rev 9211) @@ -144,6 +144,9 @@ private PortalObject selectedObject; /** . */ + private PortalObject selectedDeletingObject; + + /** . */ private PropertiesBean selectedProperties; /** . */ @@ -371,6 +374,11 @@ return selectedObject; } + public PortalObject getSelectedDeletingObject() + { + return selectedDeletingObject; + } + public PropertiesBean getSelectedProperties() { return selectedProperties; @@ -428,6 +436,15 @@ selectObject(); } + public void selectDeletingObject(ActionEvent ae) + { + PortalObjectId poid = getSelectedPortalObjectId(); + + selectedDeletingObject = portalObjectContainer.getObject(poid); + selectObject(); + + } + public String makeObjectDefault() { PortalObjectId poid = getSelectedPortalObjectId(); @@ -528,7 +545,7 @@ Map pmap = getRequestParameterMap(); selectedPlugin = (String)pmap.get("plugin"); } - + public Map getRequestParameterMap() { return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); @@ -573,15 +590,27 @@ PortalObjectId poid = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT); PortalObject object = portalObjectContainer.getObject(poid); - selectObject(object.getParent()); + if (object != null) + { + selectObject(object.getParent()); - String stringMessage = object.getName() + " has successfully been destroyed"; + String stringMessage = object.getName() + " has successfully been destroyed"; - // - object.getParent().destroyChild(object.getName()); + // + object.getParent().destroyChild(object.getName()); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); - FacesContext.getCurrentInstance().addMessage("status", message); + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); + FacesContext.getCurrentInstance().addMessage("status", message); + + selectedDeletingObject = null; + } + else + { + String stringMessage = "Cannot delete this already deleted object"; + + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, stringMessage, stringMessage); + FacesContext.getCurrentInstance().addMessage("status", message); + } } } catch (Exception e) Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-29 23:40:15 UTC (rev 9210) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-30 01:24:27 UTC (rev 9211) @@ -12,6 +12,13 @@ <ui:param name="portalObjectScreen" value="Delete"/> <ui:define name="content"> + <f:subview rendered="#{empty portalobjectmgr.selectedDeletingObject}"> + <p class="portlet-msg-error">Inconsistent state</p> + </f:subview> + + <f:subview rendered="#{not empty portalobjectmgr.selectedDeletingObject}"> + + <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> @@ -32,7 +39,7 @@ <h:form> <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button portlet-section-buttonrow"> - <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/> + <f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/> </h:commandButton> <h:commandButton value="Cancel" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" @@ -40,6 +47,7 @@ </h:form> </div> </div> + </f:subview> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-29 23:40:15 UTC (rev 9210) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-30 01:24:27 UTC (rev 9211) @@ -43,7 +43,7 @@ <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> Display Names </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectObject}"> + actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> Delete </h:commandLink> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-29 23:40:15 UTC (rev 9210) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 01:24:27 UTC (rev 9211) @@ -56,7 +56,7 @@ </h:commandLink> </h:panelGroup> | <h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectObject}"> + actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> Delete </h:commandLink> @@ -114,7 +114,7 @@ <f:param name="id" value="#{object.id}"/> Display Names </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectObject}"> + actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> Delete </h:commandLink> @@ -189,7 +189,7 @@ actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> Rename - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}" + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}" styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> Delete