From 4e67665b7f388a497e5e8b4c87df7826cf20ba44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Feb 2013 13:23:54 +0100 Subject: [PATCH] Builds page: Remove redundant tab titles --- src/lib/Hydra/Base/Controller/ListBuilds.pm | 6 ++++-- src/root/build.tt | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lib/Hydra/Base/Controller/ListBuilds.pm b/src/lib/Hydra/Base/Controller/ListBuilds.pm index 3773ed11..73fc9c6a 100644 --- a/src/lib/Hydra/Base/Controller/ListBuilds.pm +++ b/src/lib/Hydra/Base/Controller/ListBuilds.pm @@ -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 { diff --git a/src/root/build.tt b/src/root/build.tt index 08f5cef0..ecd3c90c 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -71,7 +71,7 @@