Merge "Zuul status: only display time on live changes"

This commit is contained in:
Jenkins 2015-02-14 00:02:16 +00:00 committed by Gerrit Code Review
commit 9835fc6a3d

View File

@ -272,9 +272,12 @@ function format_change(change, change_queue) {
// Row #1 of the header (project and remaining time) // Row #1 of the header (project and remaining time)
html += '<span class="project">' + change['project'] + '</span>'; html += '<span class="project">' + change['project'] + '</span>';
html += '<span class="time" title="Remaining Time">'; if (change.live === true) {
html += format_time(change['remaining_time'], true); html += '<span class="time" title="Remaining Time">';
html += '</span><br/>'; html += format_time(change['remaining_time'], true);
html += '</span>';
}
html += '<br/>';
// Row #2 of the header (change id and enqueue time) // Row #2 of the header (change id and enqueue time)
html += '<span class="changeid"> '; html += '<span class="changeid"> ';
@ -297,9 +300,10 @@ function format_change(change, change_queue) {
html += '&nbsp;'; html += '&nbsp;';
} }
html += '</span>'; html += '</span>';
html += '<span class="time" title="Queued Time">'; if (change.live === true) {
html += format_enqueue_time(change['enqueue_time']) + '</span>'; html += '<span class="time" title="Queued Time">';
html += format_enqueue_time(change['enqueue_time']) + '</span>';
}
html += '</div>'; html += '</div>';
// Job listing from here down // Job listing from here down