* Unify rendering of finished and scheduled builds.

[?]
Nov 26, 2008, 5:43 PM
JLDUSNUOOQNL63BOPXIWZOWFRQ5X35RWG33PJB3J3KMR6QR7TN7QC

Dependencies

Change contents

  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 21
    [3.23][3.23:50]()
    my ( $self, $c ) = @_;
    [3.23]
    [3.50]
    my ($self, $c) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 50
    [3.1382][3.1382:1409]()
    my ( $self, $c ) = @_;
    [3.1382]
    [3.1409]
    my ($self, $c) = @_;
  • edit in src/Hydra/lib/Hydra/Controller/Root.pm at line 52
    [3.98][3.0:124](),[3.62][3.0:124]()
    $c->stash->{scheduled} = [$c->model('DB::Builds')->search(
    {finished => 0}, {join => 'schedulingInfo'})]; # !!!
  • edit in src/Hydra/lib/Hydra/Controller/Root.pm at line 61
    [3.604]
    [3.0]
    }
    sub queue :Local {
    my ($self, $c) = @_;
    $c->stash->{template} = 'queue.tt';
    $c->stash->{queue} = [$c->model('DB::Builds')->search(
    {finished => 0}, {join => 'schedulingInfo', order_by => ["priority DESC", "timestamp"]})];
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 193
    [3.25][3.506:560]()
    my ( $self, $c, $projectName, $subcommand ) = @_;
    [3.25]
    [3.66]
    my ($self, $c, $projectName, $subcommand) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 248
    [3.1289][3.1289:1329]()
    my ( $self, $c, $subcommand ) = @_;
    [3.1289]
    [3.3]
    my ($self, $c, $subcommand) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 274
    [3.21][3.2107:2158]()
    my ( $self, $c, $projectName, $jobName ) = @_;
    [3.21]
    [3.58]
    my ($self, $c, $projectName, $jobName) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 289
    [3.1531][3.1531:1558]()
    my ( $self, $c ) = @_;
    [3.1531]
    [3.1558]
    my ($self, $c) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 295
    [3.1615][3.1615:1647]()
    my ( $self, $c, $id ) = @_;
    [3.1615]
    [3.1647]
    my ($self, $c, $id) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 316
    [3.1886][3.0:32]()
    my ( $self, $c, $id ) = @_;
    [3.1886]
    [3.1929]
    my ($self, $c, $id) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 332
    [3.186][3.186:227]()
    my ( $self, $c, $id, $stepnr ) = @_;
    [3.186]
    [3.227]
    my ($self, $c, $id, $stepnr) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 365
    [3.24][3.0:62]()
    my ( $self, $c, $id, $productnr, $filename, @path ) = @_;
    [3.24]
    [3.2595]
    my ($self, $c, $id, $productnr, $filename, @path) = @_;
  • replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 399
    [3.96][3.96:145]()
    my ( $self, $c, $buildId, $productnr ) = @_;
    [3.96]
    [3.145]
    my ($self, $c, $buildId, $productnr) = @_;
  • file deletion: short-build-info.tt (----------)short-build-info.tt (----------)
    [3.857][3.1130:1173](),[3.1173][3.2074:2074](),[3.7332][3.2540:2583](),[3.2583][3.2074:2074]()
    [% USE date %]
    <tr>
    <td>
    <img src="/static/images/success.gif" />
    [% ELSE %]
    <img src="/static/images/failure.gif" />
    [% END %]
    </td>
    <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
    <td><tt>[% build.system %]</tt></td>
    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
    <td>[% build.description %]</td>
    </tr>
    <td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>
    <td><a href="[% c.uri_for('/job' build.project.name build.attrname) %]"><tt>[% build.attrname %]</tt></a></td>
    [% IF build.resultInfo.buildstatus == 0 %]
  • edit in src/Hydra/root/common.tt at line 1
    [3.2803]
    [3.2804]
    [% USE date %]
  • edit in src/Hydra/root/common.tt at line 15
    [2.5205][2.5205:5220]()
    [% USE date %]
  • edit in src/Hydra/root/common.tt at line 18
    [2.5301]
    [2.5301]
    [% END %]
    [% BLOCK renderBuildList %]
    <table class="tablesorter">
    <thead>
    <tr>
    [% IF !hideResultInfo %]
    <th></th>
    [% END %]
    <th>#</th>
    [% IF showSchedulingInfo %]
    <th>Priority</th>
    [% END %]
    <th>Project</th>
    <th>Job</th>
    <th>System</th>
    <th>Timestamp</th>
    <th>Description</th>
    </tr>
    </thead>
    <tbody>
    [% FOREACH build IN builds -%]
    <tr [% IF build.schedulingInfo.busy %]class="runningJob"[% END %] >
    [% IF !hideResultInfo %]
    <td>
    [% IF build.resultInfo.buildstatus == 0 %]
    <img src="/static/images/success.gif" />
    [% ELSE %]
    <img src="/static/images/failure.gif" />
    [% END %]
    </td>
    [% END %]
    <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
    [% IF showSchedulingInfo %]
    <td>[% build.schedulingInfo.priority %]</td>
    [% END %]
    <td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>
    <td><a href="[% c.uri_for('/job' build.project.name build.attrname) %]"><tt>[% build.attrname %]</tt></a></td>
    <td><tt>[% build.system %]</tt></td>
    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
    <td>[% build.description %]</td>
    </tr>
    [% END -%]
    </tbody>
    </table>
  • replacement in src/Hydra/root/index.tt at line 2
    [3.10761][3.3334:3349]()
    [% USE date %]
    [3.10761]
    [3.3523]
    [% PROCESS common.tt %]
  • edit in src/Hydra/root/index.tt at line 6
    [3.1278][3.3349:3350](),[3.3549][3.3349:3350](),[3.3349][3.3349:3350](),[3.3350][3.3550:3566](),[3.3566][3.1279:1349](),[3.3365][3.1279:1349](),[3.1349][3.400:401](),[3.3365][3.400:401](),[3.10776][3.400:401](),[3.401][3.3366:3404](),[3.3404][3.0:122](),[3.122][3.3516:3537](),[3.3516][3.3516:3537](),[3.3537][3.6775:7072](),[3.7072][3.1350:1397](),[3.1397][3.7122:7281](),[3.7122][3.7122:7281](),[3.7281][3.3865:3912](),[3.3865][3.3865:3912]()
    <h2>Queue</h2>
    [% IF scheduled.size == 0 %]
    <p>The queue is empty.</p>
    [% ELSE %]
    <table class="tablesorter">
    <thead>
    <tr><th>#</th><th>Priority</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
    </thead>
    <tbody>
    [% FOREACH build IN scheduled -%]
    <tr [% IF build.schedulingInfo.busy %]class="runningJob"[% END %] >
    <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
    <td>[% build.schedulingInfo.priority %]</td>
    <td><tt>[% build.project.name %]</tt></td>
    <td><tt>[% build.attrname %]</tt></td>
    <td><tt>[% build.system %]</tt></td>
    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
    <td>[% build.description %]</td>
    </tr>
    [% END -%]
    </tbody>
    </table>
  • edit in src/Hydra/root/index.tt at line 7
    [3.1399][3.1399:1409]()
    [% END %]
  • edit in src/Hydra/root/index.tt at line 8
    [3.3913][3.1410:1411]()
  • replacement in src/Hydra/root/index.tt at line 12
    [3.422][3.881:919](),[3.919][3.3408:3522](),[3.714][3.1003:1133](),[3.3522][3.1003:1133](),[3.4185][3.1003:1133](),[3.1003][3.1003:1133](),[3.1133][3.615:624](),[3.615][3.615:624]()
    <table class="tablesorter">
    <thead>
    <tr><th></th><th>#</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
    </thead>
    <tbody>
    [% FOREACH build IN latestBuilds -%]
    [% INCLUDE "short-build-info.tt" %]
    [% END -%]
    </tbody>
    </table>
    [3.422]
    [3.10776]
    [% PROCESS renderBuildList builds=latestBuilds %]
  • replacement in src/Hydra/root/index.tt at line 19
    [3.10798][3.1134:1172](),[3.1172][3.3523:3637](),[3.814][3.1255:1382](),[3.3637][3.1255:1382](),[3.1255][3.1255:1382](),[3.1382][3.11164:11173](),[3.11164][3.11164:11173]()
    <table class="tablesorter">
    <thead>
    <tr><th></th><th>#</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
    </thead>
    <tbody>
    [% FOREACH build IN allBuilds -%]
    [% INCLUDE "short-build-info.tt" %]
    [% END -%]
    </tbody>
    </table>
    [3.10798]
    [3.1414]
    [% PROCESS renderBuildList builds=allBuilds %]
  • edit in src/Hydra/root/job.tt at line 2
    [3.1432]
    [3.1432]
    [% PROCESS common.tt %]
  • replacement in src/Hydra/root/job.tt at line 6
    [3.1485][3.1322:1599](),[3.1599][3.1661:1670](),[3.1661][3.1661:1670]()
    <table class="tablesorter">
    <thead>
    <tr><th></th><th>Id</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
    </thead>
    <tbody>
    [% FOREACH build IN builds -%]
    [% INCLUDE "short-build-info.tt" %]
    [% END -%]
    </tbody>
    </table>
    [3.1485]
    [3.1670]
    [% PROCESS renderBuildList builds=builds %]
  • replacement in src/Hydra/root/static/css/hydra.css at line 188
    [3.251][3.1538:1554]()
    tr.runningJob {
    [3.251]
    [3.1554]
    .runningJob {