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

* Only include the system type in URLs if there are multiple jobs with

Browse source 
the same name.
This commit is contained in:
Eelco Dolstra 2010-03-07 11:38:39 +00:00
parent b8a78b2c3f
commit f816a5a28d
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/View.pm
View file

@ -162,6 +162,10 @@ sub result : Chained('view') PathPart('') {
my $result = getViewResult($primaryBuild, $c->stash->{jobs}); my $result = getViewResult($primaryBuild, $c->stash->{jobs});
$c->stash->{result} = $result; $c->stash->{result} = $result;
my %jobNames;
$jobNames{$_->{job}->job}++ foreach @{$result->{jobs}};
$c->stash->{jobNames} = \%jobNames;
if (scalar @args == 1 && $args[0] eq "release") { if (scalar @args == 1 && $args[0] eq "release") {
requireProjectOwner($c, $c->stash->{project}); requireProjectOwner($c, $c->stash->{project});

4
src/root/view-result.tt
View file

@ -27,7 +27,9 @@
[% IF j.build.resultInfo.buildstatus == 0 %] [% IF j.build.resultInfo.buildstatus == 0 %]
[% IF j.build.buildproducts %] [% IF j.build.buildproducts %]
[% INCLUDE renderProductList build=j.build latestRoot=['/view' project.name view.name 'latest' "${j.job.job}-${j.build.system}"] %] [% p = jobNames.${j.job.job} > 1 ? "-${j.build.system}" : "";
INCLUDE renderProductList build=j.build latestRoot=['/view' project.name view.name 'latest' "${j.job.job}${p}"]
%]
[% ELSE %] [% ELSE %]
<p><em>Succeeded.</em></p> <p><em>Succeeded.</em></p>
[% END %] [% END %]