You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/07/24 21:38:26 UTC

svn commit: r425156 - in /geronimo/branches/1.1/applications/console-standard/src: java/org/apache/geronimo/console/webmanager/ webapp/WEB-INF/view/webmanager/connector/

Author: jbohn
Date: Mon Jul 24 12:38:26 2006
New Revision: 425156

URL: http://svn.apache.org/viewvc?rev=425156&view=rev
Log:
GERONIMO-1182 Challenge on delete of connector from web console - thanks Vamsavardhana Reddy!


Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=425156&r1=425155&r2=425156&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Mon Jul 24 12:38:26 2006
@@ -69,6 +69,12 @@
 
     public void processAction(ActionRequest actionRequest,
                               ActionResponse actionResponse) throws PortletException, IOException {
+        String submit = actionRequest.getParameter("submit");
+        if ("Cancel".equalsIgnoreCase(submit)) {
+            // User clicked on "Cancel" button in add/edit connector page
+            actionResponse.setRenderParameter("mode", "list");
+            return;
+        }
         String mode = actionRequest.getParameter("mode");
         String managerURI = actionRequest.getParameter("managerURI");
         String containerURI = actionRequest.getParameter("containerURI");

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=425156&r1=425155&r2=425156&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Mon Jul 24 12:38:26 2006
@@ -82,7 +82,11 @@
 <!-- Submit Button -->
   <tr>
     <td><div align="right"></div></td>
-    <td><input name="submit" type="submit" value="Save"></td>
+    <td>
+      <input name="submit" type="submit" value="Save">
+      <input name="reset" type="reset" value="Reset">
+      <input name="submit" type="submit" value="Cancel">
+    </td>    
   </tr>
 </table>
 </form>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=425156&r1=425155&r2=425156&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Mon Jul 24 12:38:26 2006
@@ -277,7 +277,11 @@
 <!-- Submit Button -->
   <tr>
     <td><div align="right"></div></td>
-    <td><input name="submit" type="submit" value="Save"></td>
+    <td>
+      <input name="submit" type="submit" value="Save">
+      <input name="reset" type="reset" value="Reset">
+      <input name="submit" type="submit" value="Cancel">
+    </td>    
   </tr>
 </table>
 </form>

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=425156&r1=425155&r2=425156&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Mon Jul 24 12:38:26 2006
@@ -57,7 +57,7 @@
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}" />
-               </portlet:actionURL>">delete</a>
+               </portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${info.displayName}?');">delete</a>
             </td>
             <td>${info.description}</td>
           </tr>