delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Builds page: Remove redundant tab titles

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-14 13:23:54 +01:00
parent 1160e17bfc
commit 4e67665b7f
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/Hydra/Base/Controller/ListBuilds.pm
View file

@ -22,6 +22,7 @@ sub getJobStatus {
return $latest;
}
sub jobstatus : Chained('get_builds') PathPart Args(0) {
my ($self, $c) = @_;
$c->stash->{template} = 'jobstatus.tt';
@ -29,6 +30,7 @@ sub jobstatus : Chained('get_builds') PathPart Args(0) {
}
# A convenient way to see all the errors - i.e. things demanding
# attention - at a glance.
sub errors : Chained('get_builds') PathPart Args(0) {
@ -78,8 +80,8 @@ sub nix : Chained('get_builds') PathPart('channel') CaptureArgs(1) {
$c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
$c->stash->{channelBuilds} = $c->stash->{latestSucceeded}
->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')")
->search({}, { join => ["buildoutputs"]
, columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
->search({}, { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
, join => ["buildoutputs"]
, '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });
}
else {

8
src/root/build.tt
View file

@ -71,7 +71,7 @@
<ul id="tab" class="nav nav-tabs">
<li><a href="#tabs-summary" data-toggle="tab">Summary</a></li>
<li><a href="#tabs-information" data-toggle="tab">Information</a></li>
<li><a href="#tabs-information" data-toggle="tab">Details</a></li>
<li><a href="#tabs-buildinputs" data-toggle="tab">Build inputs</a></li>
[% IF relatedbuilds %]<li><a href="#tabs-relatedbuilds" data-toggle="tab">Related builds</a></li>[% END %]
[% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
@ -220,8 +220,6 @@
</div>
<div id="tabs-information" class="tab-pane">
<h2>Information</h2>
<table class="layoutTable">
[% IF build.nixexprinput %]
<tr>
@ -319,8 +317,6 @@
</div>
<div id="tabs-buildinputs" class="tab-pane">
<h2>Build inputs</h2>
<table class="tablesorter table table-striped table-condensed">
<thead>
<tr><th>Name</th><th>Type</th><th>Value</th><th>Revision</th><th>Store path</th></tr>
@ -357,7 +353,6 @@
[% IF relatedbuilds %]
<div id="tabs-relatedbuilds" class="tab-pane">
<h2>Related builds</h2>
<p>The following builds are part of the same jobset evaluation that produced this build.</p>
[% INCLUDE renderBuildList builds=relatedbuilds hideProjectName=1 hideJobsetName=1 %]
</div>
@ -365,7 +360,6 @@
[% IF build.buildsteps %]
<div id="tabs-buildsteps" class="tab-pane">
<h2>All build steps</h2>
[% INCLUDE renderBuildSteps type="All" %]
</div>
[% END %]