Author: thomas.heute(a)jboss.com
Date: 2007-05-23 06:22:32 -0400 (Wed, 23 May 2007)
New Revision: 7308
Added:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
Log:
JBPORTAL-1453: The destroy action for portlet instances has no confirmation screen for
it.
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-05-23
09:30:24 UTC (rev 7307)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-05-23
10:22:32 UTC (rev 7308)
@@ -35,6 +35,7 @@
import javax.faces.application.FacesMessage;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
import org.jboss.portal.common.value.Value;
@@ -311,14 +312,17 @@
selectedPrefs = null;
}
- public void deleteInstance()
+ public void selectInstance(ActionEvent e)
{
+ selectInstance();
+ }
+
+
+ public void deleteInstance(ActionEvent ae)
+ {
try
{
- FacesContext ctx = FacesContext.getCurrentInstance();
- ExternalContext ectx = ctx.getExternalContext();
- Map params = ectx.getRequestParameterMap();
- String id = (String)params.get("id");
+ String id =
(String)ae.getComponent().getAttributes().get("instanceId");
//
instanceContainer.destroyDefinition(id);
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-05-23
09:30:24 UTC (rev 7307)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-05-23
10:22:32 UTC (rev 7308)
@@ -362,6 +362,10 @@
<from-outcome>confirm</from-outcome>
<to-view-id>/WEB-INF/jsf/common/confirm.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>confirmDeleteInstance</from-outcome>
+ <to-view-id>/WEB-INF/jsf/confirmDeleteInstance.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<lifecycle>
Added:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
(rev 0)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-05-23
10:22:32 UTC (rev 7308)
@@ -0,0 +1,22 @@
+<div
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:jbp="http://www.jboss.org/portal"
+
xmlns:c="http://java.sun.com/jstl/core"
+ class="admin-ui">
+
+ <p class="portlet-msg-alert">WARNING ! You are about to delete the
following portlet instance:</p>
+
+ <h:outputText value="#{instancemgr.selectedInstance.id}"/>
+
+ <p class="portlet-class">Are you sure ?</p>
+
+ <h:form>
+ <h:commandButton value="Yes" action="instances"
actionListener="#{instancemgr.deleteInstance}"
styleClass="portlet-form-button">
+ <f:attribute name="instanceId"
value="#{instancemgr.selectedInstance.id}"/>
+ </h:commandButton>
+ <h:commandButton value="No" action="instances"
actionListener="objects" styleClass="portlet-form-button"/>
+ </h:form>
+</div>
\ No newline at end of file
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-23
09:30:24 UTC (rev 7307)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-23
10:22:32 UTC (rev 7308)
@@ -38,7 +38,7 @@
<h:outputText value="Preferences"/>
<f:param name="id"
value="#{instance.id}"/>
<f:param name="plugin"
value="preferences"/>
- </h:commandLink> | </h:panelGroup><h:commandLink
action="#{instancemgr.deleteInstance}">
+ </h:commandLink> | </h:panelGroup><h:commandLink
action="confirmDeleteInstance"
actionListener="#{instancemgr.selectInstance}">
<h:outputText value="Destroy"/>
<f:param name="id"
value="#{instance.id}"/>
</h:commandLink>