[portal-commits] JBoss Portal SVN: r9224 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2007-11-30 11:12:30 -0500 (Fri, 30 Nov 2007)
New Revision: 9224

Modified:
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
Let rename/delete the correct stuff

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-30 15:36:56 UTC (rev 9223)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml	2007-11-30 16:12:30 UTC (rev 9224)
@@ -40,20 +40,22 @@
          Theme
       </h:commandLink>
          <h:panelGroup
-               rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+               rendered="#{(object.name != 'admin') and (object.name != 'template')}">
             | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
                              styleClass="actionRename">
             <h:outputText value="Rename"/>
             <f:param name="id" value="#{object.id}"/>
          </h:commandLink>
-      </h:panelGroup>
-      <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'default')}">
+         </h:panelGroup>
+         <h:panelGroup
+               rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
          | <h:commandLink action="confirm" styleClass="actionDelete"
                           actionListener="#{portalobjectmgr.selectDeletingObject}">
          <f:param name="id" value="#{object.id}"/>
          Delete
        </h:commandLink>
       </h:panelGroup>
+         </h:panelGroup>
          <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
                                                                           action="#{portalobjectmgr.makeObjectDefault}">
             <f:param name="id" value="#{object.id}"/>