lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

BuildDiff: move cmdBuilds from Controller/JobsetEval

Browse source
This commit is contained in:
Cole Helbling 2022-01-10 10:35:07 -08:00
parent 0c51f3ca7d
commit ec98bdaaaa
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lib/Hydra/Controller/JobsetEval.pm
View file

@ -64,18 +64,9 @@ sub view_GET {
$c->stash->{otherEval} = $eval2 if defined $eval2; $c->stash->{otherEval} = $eval2 if defined $eval2;
sub cmpBuilds {
my ($left, $right) = @_;
return $left->get_column('job') cmp $right->get_column('job')
|| $left->get_column('system') cmp $right->get_column('system')
}
my @builds = $eval->builds->search($filter, { columns => [@buildListColumns] }); my @builds = $eval->builds->search($filter, { columns => [@buildListColumns] });
my @builds2 = defined $eval2 ? $eval2->builds->search($filter, { columns => [@buildListColumns] }) : (); my @builds2 = defined $eval2 ? $eval2->builds->search($filter, { columns => [@buildListColumns] }) : ();
@builds = sort { cmpBuilds($a, $b) } @builds;
@builds2 = sort { cmpBuilds($a, $b) } @builds2;
buildDiff(@builds, @builds2); buildDiff(@builds, @builds2);
$c->stash->{full} = ($c->req->params->{full} || "0") eq "1"; $c->stash->{full} = ($c->req->params->{full} || "0") eq "1";

9
src/lib/Hydra/Helper/BuildDiff.pm
View file

@ -15,6 +15,15 @@ our @EXPORT = qw(
use Data::Dumper; use Data::Dumper;
sub cmpBuilds {
my ($left, $right) = @_;
return $left->get_column('job') cmp $right->get_column('job')
|| $left->get_column('system') cmp $right->get_column('system')
}
# $builds = sort { cmpBuilds($a, $b) } $builds;
# $builds2 = sort { cmpBuilds($a, $b) } $builds2;
sub buildDiff { sub buildDiff {
my ($builds, $builds2) = @_; my ($builds, $builds2) = @_;