[FIXED JENKINS-26900] AsynchronousExecution.displayCell

jenkinsci · Mar 24, 2015 · bb80340 · bb80340
1 parent 8589b21
commit bb80340
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java b/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java
@@ -74,6 +74,12 @@ protected AsynchronousExecution() {}
      */
     public abstract boolean blocksRestart();
 
+    /**
+     * Allows an executable to control whether or not to display {@code executorCell.jelly}.
+     * @return traditionally always true
+     */
+    public abstract boolean displayCell();
+
     /**
      * Obtains the associated executor.
      */

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
@@ -39,8 +39,9 @@ THE SOFTWARE.
       <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
     </d:tag>
     <d:tag name="executor">
+      <j:set var="ae" value="${e.asynchronousExecution}"/>
       <j:choose>
-        <j:when test="${!c.offline or (c.offline and !e.idle)}">
+        <j:when test="${(!c.offline or (c.offline and !e.idle)) and (ae == null || ae.displayCell())}">
           <tr>
             <td class="pane" align="right" style="vertical-align: top">
               ${name}