You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/17 04:31:52 UTC
svn commit: r1674190 - in /continuum/trunk/continuum-webapp/src/main:
resources/localization/Continuum.properties
webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Author: batkinson
Date: Fri Apr 17 02:31:51 2015
New Revision: 1674190
URL: http://svn.apache.org/r1674190
Log:
[CONTINUUM-2435] Queues page should say whether build was forced or scheduled
Modified:
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=1674190&r1=1674189&r2=1674190&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Fri Apr 17 02:31:51 2015
@@ -916,6 +916,7 @@ buildDefinitionError.section.title=Delet
# ----------------------------------------------------------------------
# Page: Queues
# ----------------------------------------------------------------------
+buildQueue.triggeredBy=Triggered By
buildQueue.page.title = Continuum - Build Queue
buildQueue.section.title = Build Queue
buildQueue.empty = Build Queue is empty
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=1674190&r1=1674189&r2=1674190&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 Fri Apr 17 02:31:51 2015
@@ -52,6 +52,7 @@
</s:url>
<s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
+ <ec:column property="task.buildTrigger.triggeredBy" title="buildQueue.triggeredBy" />
<ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
@@ -101,6 +102,7 @@
</s:url>
<s:a href="%{viewUrl}"><c:out value="${queue.task.projectName}"/></s:a>
</ec:column>
+ <ec:column property="task.buildTrigger.triggeredBy" title="buildQueue.triggeredBy" />
<ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
<ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">