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/08/26 16:11:34 UTC
svn commit: r240247 - in /maven/continuum/trunk/continuum-web/src/main:
java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java
resources/templates/screens/View.vm
Author: evenisse
Date: Fri Aug 26 07:11:27 2005
New Revision: 240247
URL: http://svn.apache.org/viewcvs?rev=240247&view=rev
Log:
Fix notifiers block
Modified:
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java?rev=240247&r1=240246&r2=240247&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java Fri Aug 26 07:11:27 2005
@@ -54,6 +54,11 @@
try
{
+ for ( Iterator j = parameters.keySet().iterator(); j.hasNext(); )
+ {
+ String key = (String) j.next();
+ getLogger().info( "key=" + key + "-value=" + parameters.get(key).getClass().getName() + "/" + parameters.get(key) );
+ }
Object value = Ognl.getValue( scalar.getExpression(), parameters, model );
contextScalars.put( scalar.getId(), value );
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=240247&r1=240246&r2=240247&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 Fri Aug 26 07:11:27 2005
@@ -100,8 +100,7 @@
</div>
-->
-
- #if ( $project.notifier )
+ #if ( $project.notifiers )
<h3>$i18n.getString( "project.notifiers.label" )</h3>
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<tr>
@@ -122,29 +121,34 @@
#elseif ( $notifier.type == "jabber" )
<td>Jabber</td>
#end
- <td>$notifier.configuration.address</td>
+ <td>
+ #if ( $notifier.type == "irc" )
+ $notifier.configuration.host:$notifier.configuration.port$notifier.configuration.channel
+ #else
+ $notifier.configuration.address
+ #end
+ </td>
<td>Success, Failures</td>
<td>Project</td>
- #set ( $deleteNotifierLink = $link.setPage('ProjectNotifiers.vm').addPathInfo('notifierType', $notifier.type).addPathInfo('action','cam').addPathInfo('cid','deleteNotifier').addPathInfo('id', $item.id) )
#if ( $notifier.type == "irc" )
<td>
#set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
- <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ <a href="$editNotifierLink">Edit</a> <!-- | <a href="$deleteNotifierLink">Delete</a> -->
</td>
#elseif ( $notifier.type == "mail" )
<td>
#set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
- <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ <a href="$editNotifierLink">Edit</a> <!-- | <a href="$deleteNotifierLink">Delete</a> -->
</td>
#elseif ( $notifier.type == "msn" )
<td>
#set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
- <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ <a href="$editNotifierLink">Edit</a> <!-- | <a href="$deleteNotifierLink">Delete</a> -->
</td>
#elseif ( $notifier.type == "jabber" )
<td>
#set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierType', $notifier.type).addPathInfo('id', $item.id) )
- <a href="$editNotifierLink">Edit</a> | <a href="$deleteNotifierLink">Delete</a>
+ <a href="$editNotifierLink">Edit</a> <!-- | <a href="$deleteNotifierLink">Delete</a> -->
</td>
#end
</tr>