Author: thomas.heute(a)jboss.com
Date: 2008-07-24 12:22:17 -0400 (Thu, 24 Jul 2008)
New Revision: 11580
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
Log:
JBPORTAL-2081: NPE when deleting a portal
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 2008-07-24
15:37:32 UTC (rev 11579)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2008-07-24
16:22:17 UTC (rev 11580)
@@ -12,8 +12,6 @@
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.MANAGE}
<span
class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
-
-
<h:form>
<h:panelGroup rendered="#{portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PAGE}"><h:commandLink
action="editPageLayout"
actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionLayout">
@@ -32,21 +30,19 @@
<f:param name="id"
value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.THEME}
</h:commandLink><h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or
(portalobjectmgr.selectedObject.name == 'template') or
(portalobjectmgr.selectedObject.name == 'default')))}">
+ rendered="#{!((portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or
(portalobjectmgr.selectedObject.name == 'template')))}">
| <h:commandLink
action="renameObject"
actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<f:param name="id"
value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.RENAME}
</h:commandLink></h:panelGroup>
- <h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or
(portalobjectmgr.selectedObject.name == 'template') or
(portalobjectmgr.selectedObject.name == 'default')))}">
| <h:commandLink
action="#{addDisplayNameAction.editDisplayNames}"
actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<f:param name="id"
value="#{portalobjectmgr.selectedObject.id}" />
#{bundle.DISPLAY_NAMES}
- </h:commandLink></h:panelGroup>
+ </h:commandLink>
<h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or
(portalobjectmgr.selectedObject.name == 'template') or
(portalobjectmgr.selectedObject.name == 'default')))}">
+ rendered="#{!((portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or
(portalobjectmgr.selectedObject.name == 'template') or
(portalobjectmgr.selectedObject.default)))}">
| <h:commandLink action="confirm"
styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id"
value="#{portalobjectmgr.selectedObject.id}"/>
Show replies by date