ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix Changes section on build page. Now shows the changes of the first evaluation a build was part of compared to the previous one. Also separated previous builds from the changes section, as that was confusing sometimes.

Browse source
This commit is contained in:
Rob Vermaas 2014-11-18 11:00:15 +01:00
parent a1b5020562
commit fd36d79581
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/Hydra/Controller/Build.pm
View file

@ -107,6 +107,11 @@ sub build_GET {
entity => $build entity => $build
); );
my ($eval2) = $c->stash->{eval}->jobset->jobsetevals->search(
{ hasnewbuilds => 1, id => { '<', $c->stash->{eval}->id } },
{ order_by => "id DESC", rows => 1 });
$c->stash->{otherEval} = $eval2 if defined $eval2;
# If this is an aggregate build, get its constituents. # If this is an aggregate build, get its constituents.
$c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})]; $c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})];
} }

13
src/root/build.tt
View file

@ -224,8 +224,13 @@
[% INCLUDE renderBuildSteps type="Failed" %] [% INCLUDE renderBuildSteps type="Failed" %]
[% END %] [% END %]
[% IF prevSuccessfulBuild %] [% IF otherEval %]
<h3>Changes</h3> <h3>Changes</h3>
[% INCLUDE renderInputDiff inputs2=eval.jobsetevalinputs inputs1=otherEval.jobsetevalinputs %]
[% END %]
[% IF prevSuccessfulBuild %]
<h3>Previous builds</h3>
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
<thead> <thead>
<th>Last successful build [% INCLUDE renderDateTime timestamp = prevSuccessfulBuild.timestamp %]</th> <th>Last successful build [% INCLUDE renderDateTime timestamp = prevSuccessfulBuild.timestamp %]</th>
@ -250,7 +255,6 @@
[% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %] [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]
<td>[% INCLUDE renderInputDiff inputs1=prevSuccessfulBuild.inputs inputs2=firstBrokenBuild.inputs %]</td> <td>[% INCLUDE renderInputDiff inputs1=prevSuccessfulBuild.inputs inputs2=firstBrokenBuild.inputs %]</td>
[% END %] [% END %]
<td>[% INCLUDE renderInputDiff inputs1=prevSuccessfulBuild.inputs inputs2=build.inputs %]</td>
</tr> </tr>
</table> </table>
[% END %] [% END %]
@ -380,11 +384,6 @@
[% INCLUDE renderInputs inputs=build.inputs %] [% INCLUDE renderInputs inputs=build.inputs %]
[% IF prevBuild %]
<h3>Changes since previous [% INCLUDE renderBuildLink build=prevBuild %]</h3>
[% INCLUDE renderInputDiff inputs2=build.inputs inputs1=prevBuild.inputs %]
[% END %]
[% ELSIF eval %] [% ELSIF eval %]
[% INCLUDE renderInputs inputs=eval.jobsetevalinputs %] [% INCLUDE renderInputs inputs=eval.jobsetevalinputs %]