From a46f655c56927c02ed18318283530868da2490d8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 25 Mar 2021 18:14:01 -0400
Subject: [PATCH 1/2] root project listing: show hidden projects at the end
Makes the zebra striping correct.
---
src/lib/Hydra/Controller/Root.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index 66aba9e5..d6144eef 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -104,7 +104,7 @@ sub deserialize :ActionClass('Deserialize') { }
sub index :Path :Args(0) {
my ($self, $c) = @_;
$c->stash->{template} = 'overview.tt';
- $c->stash->{projects} = [$c->model('DB::Projects')->search({}, {order_by => 'name'})];
+ $c->stash->{projects} = [$c->model('DB::Projects')->search({}, {order_by => ['enabled DESC', 'name']})];
$c->stash->{newsItems} = [$c->model('DB::NewsItems')->search({}, { order_by => ['createtime DESC'], rows => 5 })];
$self->status_ok($c,
entity => $c->stash->{projects}
From cc9c91fe1218460338c52366e0e8b503f327444d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 25 Mar 2021 18:16:17 -0400
Subject: [PATCH 2/2] jobsets: put hidden and enabled jobsets at the end
Allows for generally correct zebra striping
---
src/lib/Hydra/Helper/Nix.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm
index c1f395c9..3a7b532e 100644
--- a/src/lib/Hydra/Helper/Nix.pm
+++ b/src/lib/Hydra/Helper/Nix.pm
@@ -113,7 +113,7 @@ sub registerRoot {
sub jobsetOverview_ {
my ($c, $jobsets) = @_;
return $jobsets->search({},
- { order_by => "name"
+ { order_by => ["hidden ASC", "enabled DESC", "name"]
, "+select" =>
[ "(select count(*) from Builds as a where a.finished = 0 and me.project = a.project and me.name = a.jobset and a.isCurrent = 1)"
, "(select count(*) from Builds as a where a.finished = 1 and me.project = a.project and me.name = a.jobset and buildstatus <> 0 and a.isCurrent = 1)"