You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ws...@apache.org on 2009/03/08 18:29:18 UTC
svn commit: r751474 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Author: wsmoak
Date: Sun Mar 8 17:29:18 2009
New Revision: 751474
URL: http://svn.apache.org/viewvc?rev=751474&view=rev
Log:
[CONTINUUM-2005] Added links to Queues page. Current and queued builds link to the project's Builds tab, while current and queued checkouts link to the Project Information tab.
Suggested by: David Degardini
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=751474&r1=751473&r2=751474&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Sun Mar 8 17:29:18 2009
@@ -46,8 +46,13 @@
</tr>
<c:forEach var="element" items="${currentBuildProjectTasks}">
<tr>
- <td width="20%">${element.key}</td>
- <td width="50%">${element.value.projectName}</td>
+ <td width="20%">${element.key}</td>
+ <td width="20%">
+ <s:url id="viewUrl" action="buildResults">
+ <s:param name="projectId">${element.value.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${element.value.projectName}</s:a>
+ </td>
<td width="29%">${element.value.buildDefinitionLabel}</td>
<td width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
@@ -95,7 +100,12 @@
</redback:ifAuthorized>
</td>
<td width="29%">${element.key}</td>
- <td width="50%">${buildTask.projectName}</td>
+ <td width="50%">
+ <s:url id="viewUrl" action="buildResults">
+ <s:param name="projectId">${buildTask.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${buildTask.projectName}</s:a>
+ </td>
<td width="19%">${buildTask.buildDefinitionLabel}</td>
<td width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
@@ -152,7 +162,12 @@
<c:forEach var="element" items="${currentCheckoutTasks}">
<tr>
<td width="30%">${element.key}</td>
- <td width="69%">${element.value.projectName}</td>
+ <td width="69%">
+ <s:url id="viewUrl" action="projectView">
+ <s:param name="projectId">${element.value.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${element.value.projectName}</s:a>
+ </td>
<td width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
@@ -198,7 +213,12 @@
</redback:ifAuthorized>
</td>
<td width="29%">${element.key}</td>
- <td width="69%">${checkoutTask.projectName}</td>
+ <td width="69%">
+ <s:url id="viewUrl" action="projectView">
+ <s:param name="projectId">${checkoutTask.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${checkoutTask.projectName}</s:a>
+ </td>
<td width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout">