You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/11/08 21:18:20 UTC
svn commit: r331875 - in
/maven/continuum/trunk/continuum-web/src/main/resources: forms/
templates/screens/
Author: evenisse
Date: Tue Nov 8 12:18:10 2005
New Revision: 331875
URL: http://svn.apache.org/viewcvs?rev=331875&view=rev
Log:
[CONTINUUM-407] Fix destination page for build definitions and notifiers
Modified:
maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationJabber.xml
maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationMsn.xml
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml Tue Nov 8 12:18:10 2005
@@ -50,7 +50,7 @@
<add>
<title-key>project.title.buildDefinition.add</title-key>
<action>cam</action>
- <view>Summary.vm</view>
+ <view>View.vm</view>
<view-on-failure>AddBuildDefinition.vm</view-on-failure>
<fid-on-failure>buildDefinition</fid-on-failure>
<expression>addBuildDefinition(#id)</expression>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationJabber.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationJabber.xml?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationJabber.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationJabber.xml Tue Nov 8 12:18:10 2005
@@ -142,7 +142,7 @@
<!-- Update -->
<update>
- <title-key>project.title.update</title-key>
+ <title-key>jabberNotificationTitle</title-key>
<action>updateEntity</action>
<view>Summary.vm</view>
<view-on-failure>Edit.vm</view-on-failure>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationMsn.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationMsn.xml?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationMsn.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationMsn.xml Tue Nov 8 12:18:10 2005
@@ -88,13 +88,13 @@
<action>callMethod</action>
<view>Summary.vm</view>
<view-on-failure>Add.vm</view-on-failure>
- <fid-on-failure>notificationJabber</fid-on-failure>
+ <fid-on-failure>notificationMsn</fid-on-failure>
<expression>addNotifier(#id,#notifierType,#parameters)</expression>
</add>
<!-- Update -->
<update>
- <title-key>project.title.update</title-key>
+ <title-key>msnNotificationTitle</title-key>
<action>updateEntity</action>
<view>Summary.vm</view>
<view-on-failure>Edit.vm</view-on-failure>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm Tue Nov 8 12:18:10 2005
@@ -1,5 +1,7 @@
$page.setTitle( $i18n.getString( $form.add.titleKey ) )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>$i18n.getString( $form.add.titleKey )</h3>
@@ -7,6 +9,7 @@
#hidden ( "action" "cam" )
#hidden ( "cid" "addBuildDefinition" )
#hidden ( "view" "$form.add.view" )
+ <input type="hidden" name="fid" value="${executorId}Project"/>
#hidden ( "id" $id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
Modified: 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=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteBuildDefinition.vm Tue Nov 8 12:18:10 2005
@@ -1,5 +1,7 @@
$page.setTitle( "Delete Build Definition" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Delete Build Definition</h3>
@@ -11,8 +13,9 @@
<form method="post" action="$link">
#hidden ( "cid" "deleteBuildDefinition" )
#hidden ( "action" "cam" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $data.getParameters().getString( "id" ) )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "buildDefinitionId" $data.getParameters().getString( "buildDefinitionId" ) )
<div class="functnbar3">
<input type="submit" name="deleteEntry" value="Delete"/>
Modified: 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=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/DeleteNotifier.vm Tue Nov 8 12:18:10 2005
@@ -1,5 +1,7 @@
$page.setTitle( "Delete Notifier" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Delete Notifier</h3>
@@ -11,8 +13,9 @@
<form method="post" action="$link">
#hidden ( "cid" "deleteNotifier" )
#hidden ( "action" "cam" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $data.getParameters().getString( "id" ) )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "notifierId" $data.getParameters().getString( "notifierId" ) )
<div class="functnbar3">
<input type="submit" name="deleteEntry" value="Delete"/>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm Tue Nov 8 12:18:10 2005
@@ -1,50 +1,53 @@
$page.setTitle( "Continuum - IRC Notifier" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Edit IRC Notifier</h3>
<form method="post" action="$link">
#hidden ( "action" "cam" )
#hidden ( "cid" "updateNotifier" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $project.id )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "notifierId" $notifier.id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
<th>IRC Host</th>
<td>
- <input type="text" name="host" value="$notifier.configuration.host" size="100"/>
+ <input type="text" name="host" value="#if($notifier.configuration.host)$notifier.configuration.host#end" size="100"/>
</td>
</tr>
<tr>
<th>IRC Port</th>
<td>
- <input type="text" name="port" value="$notifier.configuration.port" size="100"/>
+ <input type="text" name="port" value="#if($notifier.configuration.port)$notifier.configuration.port#end" size="100"/>
</td>
</tr>
<tr>
<th>IRC Channel</th>
<td>
- <input type="text" name="channel" value="$notifier.configuration.channel" size="100"/>
+ <input type="text" name="channel" value="#if($notifier.configuration.channel)$notifier.configuration.channel#end" size="100"/>
</td>
</tr>
<tr>
<th>Nick Name</th>
<td>
- <input type="text" name="nick" value="$notifier.configuration.nick" size="100"/>
+ <input type="text" name="nick" value="#if($notifier.configuration.nick)$notifier.configuration.nick#end" size="100"/>
</td>
</tr>
<tr>
<th>Full Name</th>
<td>
- <input type="text" name="fullName" value="$notifier.configuration.fullName" size="100"/>
+ <input type="text" name="fullName" value="#if($notifier.configuration.fullName)$notifier.configuration.fullName#end" size="100"/>
</td>
</tr>
<tr>
<th>Password</th>
<td>
- <input type="password" name="password" value="$notifier.configuration.password" size="100"/>
+ <input type="password" name="password" value="#if($notifier.configuration.password)$notifier.configuration.password#end" size="100"/>
</td>
</tr>
<tr>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditJabberNotifier.vm Tue Nov 8 12:18:10 2005
@@ -1,50 +1,53 @@
$page.setTitle( "Continuum - Jabber Notifier" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Edit Jabber Notifier</h3>
<form method="post" action="$link">
#hidden ( "action" "cam" )
#hidden ( "cid" "updateNotifier" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $project.id )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "notifierId" $notifier.id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
<th>Jabber Host</th>
<td>
- <input type="text" name="host" value="$notifier.configuration.host" size="100"/>
+ <input type="text" name="host" value="#if($notifier.configuration.host)$notifier.configuration.host#end" size="100"/>
</td>
</tr>
<tr>
<th>Jabber Port</th>
<td>
- <input type="text" name="port" value="$notifier.configuration.port" size="100"/>
+ <input type="text" name="port" value="#if($notifier.configuration.port)$notifier.configuration.port#end" size="100"/>
</td>
</tr>
<tr>
<th>Jabber Login</th>
<td>
- <input type="text" name="login" value="$notifier.configuration.login" size="100"/>
+ <input type="text" name="login" value="#if($notifier.configuration.login)$notifier.configuration.login#end" size="100"/>
</td>
</tr>
<tr>
<th>Jabber Password</th>
<td>
- <input type="password" name="password" value="$notifier.configuration.password" size="100"/>
+ <input type="password" name="password" value="#if($notifier.configuration.password)$notifier.configuration.password#end" size="100"/>
</td>
</tr>
<tr>
<th>Jabber Domain Name</th>
<td>
- <input type="text" name="domainName" value="$notifier.configuration.domainName" size="100"/>
+ <input type="text" name="domainName" value="#if($notifier.configuration.domainName)$notifier.configuration.domainName#end" size="100"/>
</td>
</tr>
<tr>
<th>Jabber Recipient</th>
<td>
- <input type="text" name="address" value="$notifier.configuration.address" size="100"/>
+ <input type="text" name="address" value="#if($notifier.configuration.address)$notifier.configuration.address#end" size="100"/>
</td>
</tr>
<tr>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMailNotifier.vm Tue Nov 8 12:18:10 2005
@@ -1,20 +1,23 @@
$page.setTitle( "Continuum - Mail Notifier" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Edit Mail Notifier</h3>
<form method="post" action="$link">
#hidden ( "action" "cam" )
#hidden ( "cid" "updateNotifier" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $project.id )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "notifierId" $notifier.id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
<th>Mail Address</th>
<td>
- <input type="text" name="address" value="$notifier.configuration.address" size="100"/>
+ <input type="text" name="address" value="#if($notifier.configuration.address)$notifier.configuration.address#end" size="100"/>
</td>
</tr>
<tr>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm?rev=331875&r1=331874&r2=331875&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditMsnNotifier.vm Tue Nov 8 12:18:10 2005
@@ -1,32 +1,35 @@
$page.setTitle( "Continuum - MSN Notifier" )
+#set ( $executorId = $data.getParameters().getString("executorId") )
+
<div class="app">
<div id="axial" class="h3">
<h3>Edit MSN Notifier</h3>
<form method="post" action="$link">
#hidden ( "action" "cam" )
#hidden ( "cid" "updateNotifier" )
- #hidden ( "view" "Summary.vm" )
+ #hidden ( "view" "View.vm" )
#hidden ( "id" $project.id )
+ #hidden ( "fid" "${executorId}Project" )
#hidden ( "notifierId" $notifier.id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
<th>MSN Login</th>
<td>
- <input type="text" name="port" value="$notifier.configuration.login" size="100"/>
+ <input type="text" name="port" value="#if($notifier.configuration.login)$notifier.configuration.login#end" size="100"/>
</td>
</tr>
<tr>
<th>MSN Password</th>
<td>
- <input type="password" name="password" value="$notifier.configuration.password" size="100"/>
+ <input type="password" name="password" value="#if($notifier.configuration.password)$notifier.configuration.password#end" size="100"/>
</td>
</tr>
<tr>
<th>MSN Recipient</th>
<td>
- <input type="text" name="address" value="$notifier.configuration.address" size="100"/>
+ <input type="text" name="address" value="#if($notifier.configuration.address)$notifier.configuration.address#end" size="100"/>
</td>
</tr>
<tr>
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=331875&r1=331874&r2=331875&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 Tue Nov 8 12:18:10 2005
@@ -95,7 +95,7 @@
<a href="$buildDefinitionLink">Edit</a> |
#end
#if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) )
- #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) )
+ #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
<a href="$deleteBuildDefinitionLink">Delete</a>
#end
</td>
@@ -172,21 +172,21 @@
#if ( $notifier.isFromUser() )
#if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) )
#if ( $notifier.type == "irc" )
- #set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id) )
+ #set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
<a href="$editNotifierLink">Edit</a>
#elseif ( $notifier.type == "mail" )
- #set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id) )
+ #set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
<a href="$editNotifierLink">Edit</a>
#elseif ( $notifier.type == "msn" )
- #set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id) )
+ #set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
<a href="$editNotifierLink">Edit</a>
#elseif ( $notifier.type == "jabber" )
- #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id) )
+ #set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
<a href="$editNotifierLink">Edit</a>
#end
#end
#if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) )
- #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id) )
+ #set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
| <a href="$deleteNotifierLink">Delete</a>
#end
#end