lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

* hydra: changes in list in stead of table, also showing changes of changed 'build output' inputs

Browse source
This commit is contained in:
Rob Vermaas 2010-02-25 09:17:17 +00:00
parent 8678da61ef
commit 7f1908a938
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/root/build.tt
View file

@ -81,7 +81,6 @@
<p class="error">[% flashMsg %]</p> <p class="error">[% flashMsg %]</p>
[% END %] [% END %]
<div id="generic-tabs"> <div id="generic-tabs">
<ul> <ul>
<li><a href="#tabs-summary">Summary</a></li> <li><a href="#tabs-summary">Summary</a></li>
@ -191,6 +190,8 @@
following changes were made since: following changes were made since:
</p> </p>
[% INCLUDE renderInputDiff build2=build , build1=prevSuccessfulBuild %] [% INCLUDE renderInputDiff build2=build , build1=prevSuccessfulBuild %]
<br />
<p/>
[% END %] [% END %]
[% IF build.resultInfo.errormsg && build.resultInfo.buildstatus != 5 %] [% IF build.resultInfo.errormsg && build.resultInfo.buildstatus != 5 %]

37
src/root/common.tt
View file

@ -278,37 +278,38 @@
[% END %] [% END %]
[% BLOCK renderInputDiff; %] [% BLOCK renderInputDiff; %]
<ul class="inputdiff">
<table class="tablesorter">
<thead>
<tr><th>Name</th><th>Change</th></tr>
</thead>
<tbody>
[% FOREACH bi1 IN build1.inputs %] [% FOREACH bi1 IN build1.inputs %]
[% deletedInput = 1 %] [% deletedInput = 1 %]
[% FOREACH bi2 IN build2.inputs %] [% FOREACH bi2 IN build2.inputs %]
[% IF bi1.name == bi2.name %] [% IF bi1.name == bi2.name %]
<tr>
[% IF bi1.type == bi2.type %] [% IF bi1.type == bi2.type %]
[% IF bi1.value != bi2.value || bi1.uri != bi2.uri || bi1.revision != bi2.revision || bi1.path != bi2.path || bi1.dependency != bi2.dependency %] [% IF bi1.value != bi2.value || bi1.uri != bi2.uri %]
<td>[% bi1.name %]</td> <li><b>[% bi1.name %]</b>: [% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]</li>
<td> [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
[% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %] <li>
</td> <b>[% bi1.name %]</b>: [% bi1.uri %] revision changed from [% bi1.revision %] to [% bi2.revision %].
</li>
[% ELSIF bi1.dependency.id != bi2.dependency.id || bi1.path != bi2.path %]
<li>
<b>[% bi1.name %]</b>: [% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]
<br/>
<br/>
[% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency %]
</li>
[% END %] [% END %]
[% ELSE %] [% ELSE %]
<td>[% bi1.name %]</td> <li><b>[% bi1.name %]</b>: Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</li>
<td>Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</td>
[% END %] [% END %]
</tr>
[% deletedInput = 0 %] [% deletedInput = 0 %]
[% END %] [% END %]
[% END %] [% END %]
[% IF deletedInput == 1 %] [% IF deletedInput == 1 %]
<tr><td>[% bi1.name %]</td><td>Input not present in this build.</td></tr> <li><b>[% bi1.name %]</b>: Input not present in this build.</li>
[% END %] [% END %]
[% END %] [% END %]
</tbody> </ul>
</table>
[% END %] [% END %]