From 85d51074b988d5236e444a3c03498ec97088a55b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Oct 2013 16:36:22 +0200 Subject: [PATCH] Jobset eval page: Show all aborted builds under the "aborted jobs" tab Previously some might be included under the "new jobs" tab --- src/lib/Hydra/Controller/JobsetEval.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/Hydra/Controller/JobsetEval.pm b/src/lib/Hydra/Controller/JobsetEval.pm index b3291166..cc06ba5a 100644 --- a/src/lib/Hydra/Controller/JobsetEval.pm +++ b/src/lib/Hydra/Controller/JobsetEval.pm @@ -82,6 +82,10 @@ sub view : Chained('eval') PathPart('') Args(0) { my $n = 0; foreach my $build (@builds) { + if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) { + push @{$c->stash->{aborted}}, $build; + next; + } my $d; my $found = 0; while ($n < scalar(@builds2)) { @@ -91,9 +95,7 @@ sub view : Chained('eval') PathPart('') Args(0) { if ($d == 0) { $n++; $found = 1; - if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) { - push @{$c->stash->{aborted}}, $build; - } elsif ($build->finished == 0 || $build2->finished == 0) { + if ($build->finished == 0 || $build2->finished == 0) { push @{$c->stash->{unfinished}}, $build; } elsif ($build->buildstatus == 0 && $build2->buildstatus == 0) { push @{$c->stash->{stillSucceed}}, $build;