[portal-commits] JBoss Portal SVN: r7290 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-05-21 07:08:30 -0400 (Mon, 21 May 2007)
New Revision: 7290
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
Log:
JBPORTAL-1448: The "Yes" and "No" links should be made into buttons to
be consistent with the rest of the screens in the portlet.
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-05-21
10:18:46 UTC (rev 7289)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-05-21
11:08:30 UTC (rev 7290)
@@ -432,8 +432,7 @@
selectObject((PortalObjectId)null);
// Get id
- Map pmap =
FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
- String id = (String)pmap.get("id");
+ String id =
(String)ae.getComponent().getAttributes().get("objectId");
// Destroy the object
if (id != null)
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21
10:18:46 UTC (rev 7289)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21
11:08:30 UTC (rev 7290)
@@ -33,15 +33,9 @@
<p class="portlet-class">Are you sure ?</p>
<h:form>
- <h:commandLink action="objects"
actionListener="#{portalobjectmgr.destroyObject}">
- <h:outputText value="Yes"/>
- <f:param name="id"
value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandLink>
- <h:outputText value=" | "/>
- <h:commandLink action="objects"
actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="No"/>
- <f:param name="id"
value="#{portalobjectmgr.selectedObject.parent.id}"/>
- </h:commandLink>
-
+ <h:commandButton value="Yes" action="objects"
actionListener="#{portalobjectmgr.destroyObject}"
styleClass="portlet-form-button">
+ <f:attribute name="objectId"
value="#{portalobjectmgr.selectedObject.id}" />
+ </h:commandButton>
+ <h:commandButton value="No" action="objects"
actionListener="objects" styleClass="portlet-form-button"/>
</h:form>
</div>
\ No newline at end of file