grahamc/hydra - Change JLDUSNUOOQNL63BOPXIWZOWFRQ5X35RWG33PJB3J3KMR6QR7TN7QC

* Unify rendering of finished and scheduled builds.

Created by Eelco Dolstra on November 26, 2008

JLDUSNUOOQNL63BOPXIWZOWFRQ5X35RWG33PJB3J3KMR6QR7TN7QC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 21 [4.804]
B:BD[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 [4.804]
B:BD[4.1382] → [4.1382:1409]
```
    my ( $self, $c ) = @_;
```
[4.1382]
[4.1409]
```
    my ($self, $c) = @_;
```

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 52 [4.804]

∅:D[5.98] → [6.0:124]

B:BD[7.62] → [6.0:124]

    $c->stash->{scheduled} = [$c->model('DB::Builds')->search(
        {finished => 0}, {join => 'schedulingInfo'})]; # !!!

Insertion in src/Hydra/lib/Hydra/Controller/Root.pm at line 61 [4.804]

[6.604]

[8.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 [4.804]

B:BD[9.25] → [8.506:560]

    my ( $self, $c, $projectName, $subcommand ) = @_;

[9.25]

[9.66]

    my ($self, $c, $projectName, $subcommand) = @_;

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 248 [4.804]
B:BD[8.1289] → [8.1289:1329]
```
    my ( $self, $c, $subcommand ) = @_;
```
[8.1289]
[10.3]
```
    my ($self, $c, $subcommand) = @_;
```
Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 274 [4.804]
B:BD[10.21] → [8.2107:2158]
```
    my ( $self, $c, $projectName, $jobName ) = @_;
```
[10.21]
[10.58]
```
    my ($self, $c, $projectName, $jobName) = @_;
```
Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 289 [4.804]
B:BD[4.1531] → [4.1531:1558]
```
    my ( $self, $c ) = @_;
```
[4.1531]
[4.1558]
```
    my ($self, $c) = @_;
```
Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 295 [4.804]
B:BD[4.1615] → [4.1615:1647]
```
    my ( $self, $c, $id ) = @_;
```
[4.1615]
[4.1647]
```
    my ($self, $c, $id) = @_;
```
Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 316 [4.804]
B:BD[4.1886] → [11.0:32]
```
    my ( $self, $c, $id ) = @_;
```
[4.1886]
[4.1929]
```
    my ($self, $c, $id) = @_;
```
Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 332 [4.804]
B:BD[12.186] → [12.186:227]
```
    my ( $self, $c, $id, $stepnr ) = @_;
```
[12.186]
[12.227]
```
    my ($self, $c, $id, $stepnr) = @_;
```

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 365 [4.804]

B:BD[13.24] → [14.0:62]

    my ( $self, $c, $id, $productnr, $filename, @path ) = @_;

[13.24]

[4.2595]

    my ($self, $c, $id, $productnr, $filename, @path) = @_;

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 399 [4.804]
B:BD[15.96] → [15.96:145]
```
    my ( $self, $c, $buildId, $productnr ) = @_;
```
[15.96]
[15.145]
```
    my ($self, $c, $buildId, $productnr) = @_;
```

File deletion: short-build-info.tt, short-build-info.tt

BF:BFD[16.857] → [16.1130:1173]

BF:BFD[16.1173] → [10.2074:2074]

BFD:BFD[4.7332] → [10.2540:2583]

BF:BFD[10.2583] → [10.2074:2074]

B:BD[10.2074] → [10.2075:2103]

∅:D[6.7329] → [10.2139:2345]

B:BD[10.2139] → [10.2139:2345]

∅:D[9.967] → [17.3752:3791]

∅:D[18.4133] → [17.3752:3791]

B:BD[19.1137] → [17.3752:3791]

∅:D[19.1137] → [10.2431:2539]

∅:D[20.1828] → [10.2431:2539]

∅:D[17.3791] → [10.2431:2539]

B:BD[10.2431] → [10.2431:2539]

B:BD[10.2345] → [18.3914:4133]

B:BD[10.2103] → [6.7282:7329]

[% 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 %]

Insertion in src/Hydra/root/common.tt at line 1 [15.2803]
[15.2803]
[15.2804]
```
[% USE date %]
```
Deletion in src/Hydra/root/common.tt at line 15 [15.2803]
B:BD[2.5205] → [2.5205:5220]
```
[% USE date %]
```

Insertion in src/Hydra/root/common.tt at line 18 [15.2803]

[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 [4.10713]
B:BD[4.10761] → [18.3334:3349]
```
[% USE date %]
```
[4.10761]
[5.3523]
```
[% PROCESS common.tt %]
```

Deletion in src/Hydra/root/index.tt at line 6 [4.10713]

∅:D[21.1278] → [18.3349:3350]

∅:D[5.3549] → [18.3349:3350]

B:BD[18.3349] → [18.3349:3350]

B:BD[18.3350] → [5.3550:3566]

∅:D[5.3566] → [21.1279:1349]

B:BD[18.3365] → [21.1279:1349]

∅:D[21.1349] → [22.400:401]

∅:D[18.3365] → [22.400:401]

B:BD[4.10776] → [22.400:401]

B:BD[22.401] → [18.3366:3404]

B:BD[18.3404] → [23.0:122]

∅:D[23.122] → [18.3516:3537]

B:BD[18.3516] → [18.3516:3537]

B:BD[18.3537] → [6.6775:7072]

B:BD[6.7072] → [21.1350:1397]

∅:D[21.1397] → [6.7122:7281]

B:BD[6.7122] → [6.7122:7281]

∅:D[6.7281] → [18.3865:3912]

B:BD[18.3865] → [18.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>

Deletion in src/Hydra/root/index.tt at line 7 [4.10713]
B:BD[21.1399] → [21.1399:1409]
```
[% END %]
```
Deletion in src/Hydra/root/index.tt at line 8 [4.10713]
B:BD[18.3913] → [21.1410:1411]

Replacement in src/Hydra/root/index.tt at line 12 [4.10713]

B:BD[22.422] → [10.881:919]

B:BD[10.919] → [17.3408:3522]

∅:D[19.714] → [10.1003:1133]

∅:D[17.3522] → [10.1003:1133]

∅:D[24.4185] → [10.1003:1133]

B:BD[10.1003] → [10.1003:1133]

∅:D[10.1133] → [22.615:624]

B:BD[22.615] → [22.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>

[22.422]

[4.10776]

[% PROCESS renderBuildList builds=latestBuilds %]

Replacement in src/Hydra/root/index.tt at line 19 [4.10713]

B:BD[4.10798] → [10.1134:1172]

B:BD[10.1172] → [17.3523:3637]

∅:D[19.814] → [10.1255:1382]

∅:D[17.3637] → [10.1255:1382]

B:BD[10.1255] → [10.1255:1382]

∅:D[10.1382] → [4.11164:11173]

B:BD[4.11164] → [4.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>

[4.10798]

[21.1414]

[% PROCESS renderBuildList builds=allBuilds %]

Insertion in src/Hydra/root/job.tt at line 2 [10.1384]
[10.1432]
[10.1432]
```
[% PROCESS common.tt %]
```

Replacement in src/Hydra/root/job.tt at line 6 [10.1384]

B:BD[10.1485] → [25.1322:1599]

∅:D[25.1599] → [10.1661:1670]

B:BD[10.1661] → [10.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>

[10.1485]

[10.1670]

[% PROCESS renderBuildList builds=builds %]

Replacement in src/Hydra/root/static/css/hydra.css at line 188 [4.8691]
B:BD[10.251] → [26.1538:1554]
```
tr.runningJob {
```
[10.251]
[26.1554]
```
.runningJob {
```

* Unify rendering of finished and scheduled builds.

Dependencies

In channels

Change contents

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 21 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 50 [4.804]

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 52 [4.804]

Insertion in src/Hydra/lib/Hydra/Controller/Root.pm at line 61 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 193 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 248 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 274 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 289 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 295 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 316 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 332 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 365 [4.804]

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 399 [4.804]

File deletion: short-build-info.tt, short-build-info.tt

Insertion in src/Hydra/root/common.tt at line 1 [15.2803]

Deletion in src/Hydra/root/common.tt at line 15 [15.2803]

Insertion in src/Hydra/root/common.tt at line 18 [15.2803]

Replacement in src/Hydra/root/index.tt at line 2 [4.10713]

Deletion in src/Hydra/root/index.tt at line 6 [4.10713]

Deletion in src/Hydra/root/index.tt at line 7 [4.10713]

Deletion in src/Hydra/root/index.tt at line 8 [4.10713]

Replacement in src/Hydra/root/index.tt at line 12 [4.10713]

Replacement in src/Hydra/root/index.tt at line 19 [4.10713]

Insertion in src/Hydra/root/job.tt at line 2 [10.1384]

Replacement in src/Hydra/root/job.tt at line 6 [10.1384]

Replacement in src/Hydra/root/static/css/hydra.css at line 188 [4.8691]