You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/11/08 00:16:33 UTC

svn commit: r592944 - in /struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main: java/org/apache/struts2/rest/example/OrdersController.java webapp/orders-deleteConfirm.jsp webapp/orders-index.jsp

Author: mrdon
Date: Wed Nov  7 15:16:32 2007
New Revision: 592944

URL: http://svn.apache.org/viewvc?rev=592944&view=rev
Log:
Adding a delete confirm screen

Added:
    struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-deleteConfirm.jsp
Modified:
    struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
    struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-index.jsp

Modified: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java?rev=592944&r1=592943&r2=592944&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java Wed Nov  7 15:16:32 2007
@@ -58,6 +58,10 @@
         model = new Order();
         return "editNew";
     }
+
+    public String deleteConfirm() {
+        return "deleteConfirm";
+    }
     
     public String destroy() {
         orders.remove(id);

Added: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-deleteConfirm.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-deleteConfirm.jsp?rev=592944&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-deleteConfirm.jsp (added)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-deleteConfirm.jsp Wed Nov  7 15:16:32 2007
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<title>Order ${id}</title>
+</head>
+<body>
+    <form action="../${id}?_method=DELETE" method="post">
+        <p>
+            Are you sure you want to delete order ${id}?
+        </p>
+        <div>
+            <input type="submit" value="Delete" />
+            <input type="button" value="Cancel" onclick="window.location.href = '../../orders'" />
+        </div>
+    </form>
+    <br />
+    <a href="../../orders">Back to Orders</a>
+</body>
+</html>
+	
\ No newline at end of file

Modified: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-index.jsp?rev=592944&r1=592943&r2=592944&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-index.jsp (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/orders-index.jsp Wed Nov  7 15:16:32 2007
@@ -24,7 +24,7 @@
             <td><s:property value="amount" /></td>
             <td><a href="orders/<s:property value="id" />">View</a> |
                 <a href="orders/<s:property value="id" />/edit">Edit</a> |
-                <a href="orders/<s:property value="id" />?_method=DELETE">Delete</a></td>
+                <a href="orders/<s:property value="id" />/deleteConfirm">Delete</a></td>
         </tr>
         </s:iterator>
     </table>