continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r739894 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/continuum/web/action/admin/ resources/ resources/localization/ webapp/WEB-INF/jsp/admin/
Date Mon, 02 Feb 2009 00:39:30 GMT
Author: ctan
Date: Mon Feb  2 00:39:29 2009
New Revision: 739894

URL: http://svn.apache.org/viewvc?rev=739894&view=rev
Log:
[CONTINUUM-2015] added confirmation page when deleting purge configuration

Submitted By: Gwen Harold Autencio

Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/resources/struts.xml
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=739894&r1=739893&r2=739894&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
Mon Feb  2 00:39:29 2009
@@ -265,7 +265,14 @@
     public String remove()
         throws Exception
     {
-        purgeConfigService.removePurgeConfiguration( purgeConfigId );
+        if ( confirmed )
+        {
+        	purgeConfigService.removePurgeConfiguration( purgeConfigId );
+        }
+        else
+        {
+            return CONFIRM;
+        }
         
         return SUCCESS;
     }

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=739894&r1=739893&r2=739894&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Mon Feb  2 00:39:29 2009
@@ -944,6 +944,13 @@
 purgeConfig.enabled.label = Enabled
 purgeConfig.no.repositories = No repositories to purge
 
+#-----------------------------------------------------------------------
+# Page: Delete Purge Configuration
+#-----------------------------------------------------------------------
+deletePurgeConfiguration.page.title = Continuum - Delete Purge Configuration
+deletePurgeConfiguration.section.title = Delete Purge Configuration
+deletePurgeConfiguration.confirmation.message = Are you sure you want to delete Purge Configuration
"{0}" ?
+
 # ----------------------------------------------------------------------
 # Page: Release Results
 # ----------------------------------------------------------------------

Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=739894&r1=739893&r2=739894&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Mon Feb  2 00:39:29 2009
@@ -904,6 +904,11 @@
     </action>
     
     <action name="removePurgeConfig" class="purgeConfiguration" method="remove">
+      <result name="error" type="redirect-action">
+        <param name="actionName">purgeConfigList</param>
+        <param name="errorMessage">${message}</param>
+      </result>
+      <result name="confirm">/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp</result>
       <result name="success" type="redirect-action">
         <param name="actionName">purgeConfigList</param>
       </result>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=739894&r1=739893&r2=739894&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
Mon Feb  2 00:39:29 2009
@@ -81,6 +81,7 @@
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
+                  <s:param name="description">${pageScope.repoPurge.description}</s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>
@@ -128,6 +129,7 @@
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
+                  <s:param name="description">${pageScope.dirPurge.description}</s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
             </ec:column>



Mime
View raw message