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

* Allow omitting the product number if there is only one product in a

Browse source 
build.  This allows URLs like

    http://server/job/patchelf/trunk/deb_debian40i386/latest/download

  or

    http://server/release/patchelf/unstable/latest/deb_debian40i386/download
This commit is contained in:
Eelco Dolstra 2009-04-08 09:37:05 +00:00
parent 11d8421def
commit bf2a5a2629
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,8 +102,10 @@ sub defaultUriForProduct {
sub download : Chained('build') PathPart { sub download : Chained('build') PathPart {
my ($self, $c, $productnr, @path) = @_; my ($self, $c, $productnr, @path) = @_;
$productnr = 1 if !defined $productnr;
my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr}); my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr});
notFound($c, "Build doesn't have a product $productnr.") if !defined $product; notFound($c, "Build doesn't have a product #$productnr.") if !defined $product;
notFound($c, "Product " . $product->path . " has disappeared.") unless -e $product->path; notFound($c, "Product " . $product->path . " has disappeared.") unless -e $product->path;

9
src/root/product-list.tt
View file

@ -2,6 +2,10 @@
[% BLOCK renderProductList -%] [% BLOCK renderProductList -%]
[% # Work around a strange bug: build.buildproducts.size returns 3 when the actual size is 1.
nrProducts = 0; FOREACH product IN build.buildproducts; nrProducts = nrProducts + 1; END
%]
<ul class="productList"> <ul class="productList">
[% FOREACH product IN build.buildproducts -%] [% FOREACH product IN build.buildproducts -%]
@ -108,11 +112,16 @@
<tr> <tr>
<th>Links to latest:</th> <th>Links to latest:</th>
<td> <td>
[% IF nrProducts > 1 %]
[% uri2 = "${c.uri_for(latestRoot.join('/') 'download-by-type' product.type product.subtype)}" %] [% uri2 = "${c.uri_for(latestRoot.join('/') 'download-by-type' product.type product.subtype)}" %]
<a href="[% uri2 %]"><tt>[% uri2 %]</tt></a> <a href="[% uri2 %]"><tt>[% uri2 %]</tt></a>
<br /> <br />
[% uri2 = "${c.uri_for(latestRoot.join('/') 'download' product.productnr)}" %] [% uri2 = "${c.uri_for(latestRoot.join('/') 'download' product.productnr)}" %]
<a href="[% uri2 %]"><tt>[% uri2 %]</tt></a> <a href="[% uri2 %]"><tt>[% uri2 %]</tt></a>
[% ELSE %]
[% uri2 = "${c.uri_for(latestRoot.join('/') 'download')}" %]
<a href="[% uri2 %]"><tt>[% uri2 %]</tt></a>
[% END %]
</td> </td>
</tr> </tr>
<tr><th>File size:</th><td>[% product.filesize %] bytes ([% mibs(product.filesize / (1024 * 1024)) %] MiB)</td></tr> <tr><th>File size:</th><td>[% product.filesize %] bytes ([% mibs(product.filesize / (1024 * 1024)) %] MiB)</td></tr>