* Disambiguate jobs by jobset name. I.e. jobs with the same name in

different jobsets are not considered the same job.
This commit is contained in:
Eelco Dolstra
2009-03-12 23:46:17 +00:00
parent a623ad157e
commit f2f586d842
25 changed files with 90 additions and 55 deletions

View File

@ -2,7 +2,7 @@
[% PROCESS common.tt %]
<h1>All Builds
[% IF jobName %]for Job [% curProject.name %]:[% jobName %][% ELSE %]
[% IF jobName %]for Job [% curProject.name %]:[% jobset.name %]:[% jobName %][% ELSE %]
[% IF curProject %] for Project <tt>[% curProject.name %]</tt>[% END %][% END %]</h1>
<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %]

View File

@ -3,8 +3,12 @@
[% PROCESS "product-list.tt" %]
[% USE HTML %]
[% project = build.get_column('project') %]
[% jobset = build.get_column('jobset') %]
[% job = build.get_column('job') %]
<h1>
Job <tt>[% build.project.name %]:[% build.job %]</tt> build [% id %]
Job <tt>[% project %]:[% jobset %]:[% job %]</tt> build [% id %]
[% IF !build.finished %]
[% IF build.schedulingInfo.busy %]
(currently building)
@ -73,15 +77,15 @@
</tr>
<tr>
<th>Project:</th>
<td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>
<td>[% PROCESS renderProjectName %]</td>
</tr>
<tr>
<th>Jobset:</th>
<td><tt>[% build.jobset.name %]</tt></td>
<td>[% PROCESS renderJobsetName %]</td>
</tr>
<tr>
<th>Job name:</th>
<td><a href="[% c.uri_for('/project' build.project.name 'job' build.job) %]"><tt>[% build.job %]</tt></a></td>
<td>[% PROCESS renderJobName %]</td>
</tr>
<tr>
<th>Nix name:</th>
@ -105,6 +109,10 @@
<th>License:</th>
<td>[% IF build.license %][% HTML.escape(build.license) %][% ELSE %]<em>(not given)</em>[% END %]</td>
</tr>
<tr>
<th>Homepage:</th>
<td>[% IF build.homepage %]<a [% HTML.attributes(href => build.homepage) %]>[% HTML.escape(build.homepage) %]</a>[% ELSE %]<em>(not given)</em>[% END %]</td>
</tr>
<tr>
<th>System:</th>
<td><tt>[% build.system %]</tt></td>

View File

@ -18,6 +18,25 @@
[% END %]
[% BLOCK renderProjectName -%]
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END -%]
[% BLOCK renderJobsetName -%]
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END -%]
[% BLOCK renderJobName -%]
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END -%]
[% BLOCK renderFullJobName %]
<tt>
[% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %]
</a>
[% END %]
[% BLOCK renderBuildList %]
<table class="buildList tablesorter">
<thead>
@ -29,9 +48,8 @@
[% IF showSchedulingInfo %]
<th>Priority</th>
[% END %]
<th>Project</th>
<th>Job</th>
<th>Name</th>
<th>Release Name</th>
<th>System</th>
<th>Timestamp</th>
<th>Description</th>
@ -60,8 +78,9 @@
[% IF showSchedulingInfo %]
<td>[% build.schedulingInfo.priority %]</td>
[% END %]
<td><a href="[% c.uri_for('/project' build.get_column("project")) %]"><tt>[% build.get_column("project") %]</tt></a></td>
<td><a href="[% c.uri_for('/project' build.get_column("project") 'job' build.job) %]"><tt>[% build.job %]</tt></a></td>
<td>
[% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.job %]
</td>
<td>[% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %]</td>
<td><tt>[% build.system %]</tt></td>
<td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>