Jobset eval page: Show all aborted builds under the "aborted jobs" tab

Previously some might be included under the "new jobs" tab
This commit is contained in:
Eelco Dolstra 2013-10-04 16:36:22 +02:00
parent e334ff541d
commit 85d51074b9

View file

@ -82,6 +82,10 @@ sub view : Chained('eval') PathPart('') Args(0) {
my $n = 0; my $n = 0;
foreach my $build (@builds) { foreach my $build (@builds) {
if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) {
push @{$c->stash->{aborted}}, $build;
next;
}
my $d; my $d;
my $found = 0; my $found = 0;
while ($n < scalar(@builds2)) { while ($n < scalar(@builds2)) {
@ -91,9 +95,7 @@ sub view : Chained('eval') PathPart('') Args(0) {
if ($d == 0) { if ($d == 0) {
$n++; $n++;
$found = 1; $found = 1;
if ($build->finished != 0 && ($build->buildstatus == 3 || $build->buildstatus == 4)) { if ($build->finished == 0 || $build2->finished == 0) {
push @{$c->stash->{aborted}}, $build;
} elsif ($build->finished == 0 || $build2->finished == 0) {
push @{$c->stash->{unfinished}}, $build; push @{$c->stash->{unfinished}}, $build;
} elsif ($build->buildstatus == 0 && $build2->buildstatus == 0) { } elsif ($build->buildstatus == 0 && $build2->buildstatus == 0) {
push @{$c->stash->{stillSucceed}}, $build; push @{$c->stash->{stillSucceed}}, $build;