continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r279415 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-web/src/main/resources/templates/screens/
Date Wed, 07 Sep 2005 20:29:34 GMT
Author: evenisse
Date: Wed Sep  7 13:29:24 2005
New Revision: 279415

URL: http://svn.apache.org/viewcvs?rev=279415&view=rev
Log:
[CONTINUUM-300] Add delete confirmation screen for build definitions and notifiers

Added:
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
  (with props)
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
  (with props)
Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=279415&r1=279414&r2=279415&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Wed Sep  7 13:29:24 2005
@@ -741,8 +741,6 @@
             project.removeBuildDefinition( buildDefinition );
 
             updateProject( project );
-
-            removeBuildDefinition( buildDefinition );
         }
     }
 

Added: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm?rev=279415&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
(added)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
Wed Sep  7 13:29:24 2005
@@ -0,0 +1,23 @@
+$page.setTitle( "Delete Build Definition" )
+
+<div class="app">
+  <div id="axial" class="h3">
+    <h3>Delete Build Definition</h3>
+    <div class="warningmessage">
+      <p>
+        <strong>$i18n.getString( "delete.confirmation.message" )</strong>
+      </p>
+    </div>
+    <form method="post" action="$link">
+      #hidden ( "cid" "deleteBuildDefinition" )
+      #hidden ( "action" "cam" )
+      #hidden ( "view" "Summary.vm" )
+      #hidden ( "id" $data.getParameters().getString( "id" ) )
+      #hidden ( "buildDefinitionId" $data.getParameters().getString( "buildDefinitionId"
) )
+      <div class="functnbar3">
+        <input type="submit" name="deleteEntry" value="Delete"/>
+        <input type="submit" name="cancel" value="Cancel"/>
+      </div>
+  </form>
+  </div>
+</div>

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm?rev=279415&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
(added)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
Wed Sep  7 13:29:24 2005
@@ -0,0 +1,23 @@
+$page.setTitle( "Delete Notifier" )
+
+<div class="app">
+  <div id="axial" class="h3">
+    <h3>Delete Notifier</h3>
+    <div class="warningmessage">
+      <p>
+        <strong>$i18n.getString( "delete.confirmation.message" )</strong>
+      </p>
+    </div>
+    <form method="post" action="$link">
+      #hidden ( "cid" "deleteNotifier" )
+      #hidden ( "action" "cam" )
+      #hidden ( "view" "Summary.vm" )
+      #hidden ( "id" $data.getParameters().getString( "id" ) )
+      #hidden ( "notifierId" $data.getParameters().getString( "notifierId" ) )
+      <div class="functnbar3">
+        <input type="submit" name="deleteEntry" value="Delete"/>
+        <input type="submit" name="cancel" value="Cancel"/>
+      </div>
+  </form>
+  </div>
+</div>

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=279415&r1=279414&r2=279415&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Wed Sep
 7 13:29:24 2005
@@ -83,7 +83,7 @@
         <td>
           #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId',
$buildDefinition.id).addPathInfo('id', $item.id) )
           <a href="$buildDefinitionLink">Edit</a> |
-          #set ( $deleteBuildDefinitionLink = $link.setPage('Summary.vm').addPathInfo('action','cam').addPathInfo('cid','deleteBuildDefinition').addPathInfo('buildDefinitionId',
$buildDefinition.id).addPathInfo('id', $item.id) )
+          #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId',
$buildDefinition.id).addPathInfo('id', $item.id) )
           <a href="$deleteBuildDefinitionLink">Delete</a>
         </td>
       </tr>
@@ -155,7 +155,7 @@
                 #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId',
$notifier.id).addPathInfo('id', $item.id) )
                 <a href="$editNotifierLink">Edit</a>
               #end
-              #set ( $deleteNotifierLink = $link.setPage('Summary.vm').addPathInfo('notifierId',
$notifier.id).addPathInfo('action','cam').addPathInfo('cid','deleteNotifier').addPathInfo('id',
$project.id) )
+              #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId',
$notifier.id).addPathInfo('id', $item.id) )
               | <a href="$deleteNotifierLink">Delete</a>
             #end
           </td>



Mime
View raw message