From 07decd691574889ab346f40afd47085ceb9b3b5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2016 13:13:59 +0100 Subject: [PATCH] Also hide disabled projects on the overview page by default --- src/lib/Hydra/Controller/Root.pm | 2 +- src/root/overview.tt | 28 ++++++++++++++++++++++++++-- src/root/project.tt | 4 ++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm index 8de67d1b..4aee4626 100644 --- a/src/lib/Hydra/Controller/Root.pm +++ b/src/lib/Hydra/Controller/Root.pm @@ -91,7 +91,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(isAdmin($c) ? {} : {hidden => 0}, {order_by => 'name'})]; + $c->stash->{projects} = [$c->model('DB::Projects')->search({}, {order_by => 'name'})]; $c->stash->{newsItems} = [$c->model('DB::NewsItems')->search({}, { order_by => ['createtime DESC'], rows => 5 })]; $self->status_ok($c, entity => $c->stash->{projects} diff --git a/src/root/overview.tt b/src/root/overview.tt index ebc4cea7..0e1a90c1 100644 --- a/src/root/overview.tt +++ b/src/root/overview.tt @@ -17,7 +17,31 @@ [% IF projects.size != 0 %] -

The following projects are hosted on this server:

+ + +

The following projects are hosted on this server: + +

@@ -29,7 +53,7 @@ [% FOREACH p IN projects %] - + diff --git a/src/root/project.tt b/src/root/project.tt index b48341e4..fd0dd999 100644 --- a/src/root/project.tt +++ b/src/root/project.tt @@ -53,9 +53,9 @@
[% IF project.jobsets %]

This project has the following jobsets: - + [% IF isProjectOwner %] - + [% END %]

[% INCLUDE renderJobsetOverview %]
[% INCLUDE renderProjectName project=p.name inRow=1 %] [% HTML.escape(p.displayname) %] [% WRAPPER maybeLink uri=p.homepage %][% HTML.escape(p.description) %][% END %]