* PROCESS -> INCLUDE in most cases. INCLUDE does proper scoping of

variables.
This commit is contained in:
Eelco Dolstra
2009-03-13 15:57:43 +00:00
parent 3c86b3652c
commit 107a0faa51
9 changed files with 22 additions and 22 deletions

View File

@ -64,7 +64,7 @@
[% END %]
[% ELSIF build.schedulingInfo.busy %]
<strong>Build in progress</strong>
since [% PROCESS renderDateTime timestamp = build.schedulingInfo.starttime %]
since [% INCLUDE renderDateTime timestamp = build.schedulingInfo.starttime %]
[% ELSE %]
<strong>Scheduled to be built</strong>
[% IF c.user_exists %]
@ -77,15 +77,15 @@
</tr>
<tr>
<th>Project:</th>
<td>[% PROCESS renderProjectName %]</td>
<td>[% INCLUDE renderProjectName %]</td>
</tr>
<tr>
<th>Jobset:</th>
<td>[% PROCESS renderJobsetName %]</td>
<td>[% INCLUDE renderJobsetName %]</td>
</tr>
<tr>
<th>Job name:</th>
<td>[% PROCESS renderJobName %]</td>
<td>[% INCLUDE renderJobName %]</td>
</tr>
<tr>
<th>Nix name:</th>
@ -137,16 +137,16 @@
</tr>
<tr>
<th>Time added:</th>
<td>[% PROCESS renderDateTime timestamp = build.timestamp %]</td>
<td>[% INCLUDE renderDateTime timestamp = build.timestamp %]</td>
</tr>
[% IF build.finished && build.resultInfo.buildstatus != 4 %]
<tr>
<th>Build started:</th>
<td>[% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
<td>[% IF build.resultInfo.starttime %][% INCLUDE renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
</tr>
<tr>
<th>Build finished:</th>
<td>[% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
<td>[% IF build.resultInfo.stoptime %][% INCLUDE renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>
</tr>
<tr>
<th>Duration:</th>
@ -189,7 +189,7 @@
<td><tt>[% type = input.type; inputTypes.$type %]</tt></td>
<td>
[% IF input.type == "build" %]
Job [% PROCESS renderFullJobNameOfBuild build=input.dependency %] <a href="[% c.uri_for('/build' input.dependency.id) %]">build [% input.dependency.id %]</a>
Job [% INCLUDE renderFullJobNameOfBuild build=input.dependency %] <a href="[% c.uri_for('/build' input.dependency.id) %]">build [% input.dependency.id %]</a>
[% ELSIF input.type == "string" || input.type == "boolean" %]
<tt>"[% input.value %]"</tt>
[% ELSE %]
@ -282,7 +282,7 @@
<p class="error">Note: this build is no longer available.</p>
[% END %]
[% PROCESS renderProductList %]
[% INCLUDE renderProductList %]
[% END %]
@ -300,10 +300,10 @@
<tbody>
[% FOREACH input IN build.dependents -%]
<tr>
<td>Job [% PROCESS renderFullJobNameOfBuild build=input.build %] <a href="[% c.uri_for('/build' input.build.id) %]">build [% input.build.id %]</a></td>
<td>Job [% INCLUDE renderFullJobNameOfBuild build=input.build %] <a href="[% c.uri_for('/build' input.build.id) %]">build [% input.build.id %]</a></td>
<td><tt>[% input.name %]</tt></td>
<td><tt>[% input.build.system %]</tt></td>
<td>[% PROCESS renderDateTime timestamp = input.build.timestamp %]</td>
<td>[% INCLUDE renderDateTime timestamp = input.build.timestamp %]</td>
</tr>
[% END -%]
</tbody>