You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2006/08/29 23:31:02 UTC
svn commit: r438224 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ScheduleAction.java
resources/xwork.xml webapp/editSchedule.jsp webapp/schedules.jsp
Author: jmcconnell
Date: Tue Aug 29 14:31:02 2006
New Revision: 438224
URL: http://svn.apache.org/viewvc?rev=438224&view=rev
Log:
fixed some schedule issues where the delete scehdule was not wired up and the edit/save functionality didn't work right
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=438224&r1=438223&r2=438224&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Tue Aug 29 14:31:02 2006
@@ -123,6 +123,14 @@
}
}
+ public String remove()
+ throws ContinuumException
+ {
+ getContinuum().removeSchedule( id );
+
+ return SUCCESS;
+ }
+
public Collection getSchedules()
{
return schedules;
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=438224&r1=438223&r2=438224&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Aug 29 14:31:02 2006
@@ -294,6 +294,11 @@
<result name="success" type="chain">schedules</result>
</action>
+ <action name="removeSchedule" class="schedule" method="remove">
+ <result name="success" type="chain">schedules</result>
+ </action>
+
+
</package>
<package name="component" extends="default">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp?rev=438224&r1=438223&r2=438224&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp Tue Aug 29 14:31:02 2006
@@ -12,7 +12,7 @@
<div class="axial">
<ww:form action="saveSchedule" method="post">
- <input type="hidden" name="id" value="id"/>
+ <ww:hidden name="id"/>
<table>
<tbody>
<ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp?rev=438224&r1=438223&r2=438224&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/schedules.jsp Tue Aug 29 14:31:02 2006
@@ -22,12 +22,15 @@
<ec:column property="delay" title="schedules.table.delay"/>
<ec:column property="cronExpression" title="schedules.table.cronExpression"/>
<ec:column property="actions" title=" ">
- <ww:url id="editUrl" action="schedule">
+ <ww:url id="editScheduleUrl" action="schedule">
<ww:param name="id" value="${pageScope.schedule.id}"/>
</ww:url>
- <ww:a href="%{editUrl}">Edit</ww:a>
+ <ww:url id="removeScheduleUrl" action="removeSchedule">
+ <ww:param name="id" value="${pageScope.schedule.id}"/>
+ </ww:url>
+ <ww:a href="%{editScheduleUrl}">Edit</ww:a>
- <ww:text name="delete"/>
+ <ww:a href="%{removeScheduleUrl}">Delete</ww:a>
</ec:column>
</ec:row>
</ec:table>