continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r656457 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/admin/ resources/ resources/localization/ webapp/WEB-INF/jsp/admin/
Date Wed, 14 May 2008 22:48:01 GMT
Author: olamy
Date: Wed May 14 15:48:01 2008
New Revision: 656457

URL: http://svn.apache.org/viewvc?rev=656457&view=rev
Log:
[CONTINUUM-1769] add confirmation page before deleting a profile


Added:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
  (with props)
Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
    continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
Wed May 14 15:48:01 2008
@@ -28,6 +28,7 @@
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.profile.AlreadyExistsProfileException;
+import org.apache.maven.continuum.profile.ProfileException;
 import org.apache.maven.continuum.profile.ProfileService;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.web.action.ContinuumActionSupport;
@@ -142,6 +143,13 @@
         return SUCCESS;
     }
 
+    public String confirmDelete()
+        throws ProfileException
+    {
+        this.profile = getContinuum().getProfileService().getProfile( profile.getId() );
+        return SUCCESS;
+    }
+    
     public String addInstallation()
         throws Exception
     {

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=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Wed May 14 15:48:01 2008
@@ -810,3 +810,10 @@
 deleteProjects.page.title = Continuum - Delete Continuum Projects
 deleteProjects.section.title = Delete Continuum Projects
 deleteProjects.confirmation.message = Are you sure you want to delete the projects "{0}"?
+
+# ----------------------------------------------------------------------
+# Page: Confirm Delete Build Env
+# ----------------------------------------------------------------------
+deleteBuildEnv.page.title = Continuum - Delete Build Environment
+deleteBuildEnv.section.title = Delete Build Environment
+deleteBuildEnv.confirmation.message = Are you sure you want to delete Build Environment "{0}"
?

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties?rev=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
Wed May 14 15:48:01 2008
@@ -811,3 +811,10 @@
 deleteProjects.page.title = Continuum - Supprimer des projets Continuum
 deleteProjects.section.title = Supprimer des projets Continuum
 deleteProjects.confirmation.message = Etes vous s\u00fbr de vouloir supprimer les projets
"{0}" ?
+
+# ----------------------------------------------------------------------
+# Page: Confirm Delete Build Env
+# ----------------------------------------------------------------------
+deleteBuildEnv.page.title = Continuum - Supprimer des Build Environment
+deleteBuildEnv.section.title = Supprimer un Build Environment
+deleteBuildEnv.confirmation.message = Etes vous s\u00fbr de vouloir supprimer le Build Environment
"{0}" ?
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties?rev=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_pt_BR.properties
Wed May 14 15:48:01 2008
@@ -651,3 +651,10 @@
 deleteProjects.page.title = Continuum - Delete Continuum Projects
 deleteProjects.section.title = Delete Continuum Projects
 deleteProjects.confirmation.message = Are you sure you want to delete the projects "{0}"?
+
+# ----------------------------------------------------------------------
+# Page: Confirm Delete Build Env
+# ----------------------------------------------------------------------
+deleteBuildEnv.page.title = Continuum - Delete Build Environment
+deleteBuildEnv.section.title = Delete Build Environment
+deleteBuildEnv.confirmation.message = Are you sure you want to delete Build Environment "{0}"
?
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed May 14 15:48:01 2008
@@ -594,9 +594,16 @@
     </action>
       
     <action name="deleteBuildEnv" class="profileAdministration" method="delete">
-      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
-      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
-    </action>        
+      <result name="success" type="redirect-action">
+        <param name="actionName">buildEnvList</param>
+        <param name="namespace">/admin</param>
+        <param name="method">list</param>
+      </result>
+    </action>      
+    
+    <action name="confirmDeleteBuildEnv" class="profileAdministration" method="confirmDelete">
+      <result name="success">/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp</result>
+    </action>  
       
     <action name="saveBuildEnv" class="profileAdministration" method="save">
       <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>

Added: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp?rev=656457&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
(added)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
Wed May 14 15:48:01 2008
@@ -0,0 +1,49 @@
+<%--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+  <ww:i18n name="localization.Continuum">
+    <head>
+        <title><ww:text name="deleteBuildEnv.page.title"/></title>
+    </head>
+    <body>
+      <div id="axial" class="h3">
+        <h3><ww:text name="deleteBuildEnv.section.title"/></h3>
+
+        <div class="warningmessage">
+          <p>
+            <strong>
+                <ww:text name="deleteBuildEnv.confirmation.message">
+                    <ww:param><ww:property value="profile.name"/></ww:param>
+                </ww:text>
+            </strong>
+          </p>
+        </div>
+        <div class="functnbar3">
+          <ww:form action="deleteBuildEnv!delete.action" method="post">
+            <input type="hidden" name="profile.id" value="${profile.id}" />
+            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+          </ww:form>
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=656457&r1=656456&r2=656457&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Wed
May 14 15:48:01 2008
@@ -64,7 +64,7 @@
           </a>                    
         </ec:column>
         <ec:column property="id" title="&nbsp;" width="1%">
-          <a href="deleteBuildEnv!delete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+          <a href="confirmDeleteBuildEnv!confirmDelete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
             <img src="<ww:url value='/images/delete.gif' includeParams="none"/>"
alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
           </a>                    
         </ec:column>        



Mime
View raw message