geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r426499 - in /geronimo/sandbox/svkmerge/trunk: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/
Date Fri, 28 Jul 2006 13:18:21 GMT
Author: jdillon
Date: Fri Jul 28 06:18:20 2006
New Revision: 426499

URL: http://svn.apache.org/viewvc?rev=426499&view=rev
Log:
 r548@Bliss (orig r425198):  jbohn | 2006-07-24 14:57:32 -0700
 GERONIMO-1182 Challenge on delete of connector from web console - thanks Vamsavardhana Reddy!

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 06:18:20 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:425082
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:425198

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Fri Jul 28 06:18:20 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/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
Fri Jul 28 06:18:20 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/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
Fri Jul 28 06:18:20 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/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
Fri Jul 28 06:18:20 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>



Mime
View raw message