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

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/root/all.tt
View file

@ -9,7 +9,7 @@
<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %]
out of [% totalBuilds %] in order of descending timestamp.</p>
[% PROCESS renderBuildList %]
[% INCLUDE renderBuildList %]
[<a href="[% "$baseUri/1" %]">First</a>]
[% IF page > 1 %]

22
src/root/build.tt
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>

6
src/root/common.tt
View file

@ -32,14 +32,14 @@
[% BLOCK renderFullJobName %]
<tt>
[% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %]
[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %]
</a>
[% END %]
[% BLOCK renderFullJobNameOfBuild %]
<tt>
[% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
[% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
</a>
[% END %]
@ -86,7 +86,7 @@
<td>[% build.schedulingInfo.priority %]</td>
[% END %]
<td>
[% PROCESS renderFullJobNameOfBuild %]
[% INCLUDE renderFullJobNameOfBuild %]
</td>
<td>[% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %]</td>
<td><tt>[% build.system %]</tt></td>

2
src/root/index.tt
View file

@ -7,7 +7,7 @@
<h2>Statistics</h2>
[% PROCESS showBuildStats %]
[% INCLUDE showBuildStats %]
[% END %]

2
src/root/jobstatus.tt
View file

@ -5,6 +5,6 @@
<p>Below are the latest builds for each job.</p>
[% PROCESS renderBuildList builds=latestBuilds %]
[% INCLUDE renderBuildList builds=latestBuilds %]
[% END %]

2
src/root/layout.tt
View file

@ -146,7 +146,7 @@
[% content %]
<div id="footer">
<hr />
Generated on [% PROCESS renderDateTime %].
Generated on [% INCLUDE renderDateTime %].
[% IF c.user_exists %]
You are logged in as <tt>[% c.user.username %]</tt>.
[% END %]

4
src/root/project.tt
View file

@ -97,7 +97,7 @@
<th>Last checked:</th>
<td>
[% IF jobset.lastcheckedtime %]
[% PROCESS renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, evaluation error</em>:
[% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, evaluation error</em>:
<pre class="multiLineMsg error">[% HTML.escape(jobset.errormsg) %]</pre>
[% ELSE %], <em>no errors</em>
[% END %]
@ -192,7 +192,7 @@
<h2>Statistics</h2>
[% PROCESS showBuildStats %]
[% INCLUDE showBuildStats %]
[% END %]

2
src/root/queue.tt
View file

@ -13,7 +13,7 @@
currently executing. Builds in <span
class="disabledBuild">grey</span> are currently disabled.</p>
[% PROCESS renderBuildList builds=queue showSchedulingInfo=1 hideResultInfo=1 %]
[% INCLUDE renderBuildList builds=queue showSchedulingInfo=1 hideResultInfo=1 %]
[% END %]

2
src/root/releases.tt
View file

@ -17,7 +17,7 @@
<th>Release</th>
<th>Date</th>
[% FOREACH job IN jobs %]
<th class="releaseSetJobName">[% PROCESS renderReleaseJobName %]</th>
<th class="releaseSetJobName">[% INCLUDE renderReleaseJobName %]</th>
[% END %]
</tr>
</thead>