diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm index 2a57dc1a..6c3f3b29 100644 --- a/src/lib/Hydra/Controller/Root.pm +++ b/src/lib/Hydra/Controller/Root.pm @@ -331,7 +331,10 @@ sub search :Local Args(0) { , "project.hidden" => 0 , "jobset.hidden" => 0 }, - { order_by => ["project", "jobset", "name"], join => ["project", "jobset"] } ) ]; + { order_by => ["enabled_ desc", "project", "jobset", "name"], join => ["project", "jobset"] + , "+select" => [\ "(project.enabled = 1 and jobset.enabled = 1 and exists (select 1 from Builds where project = project.name and jobset = jobset.name and job = me.name and iscurrent = 1)) enabled_"] + , "+as" => ["enabled"] + } ) ]; } diff --git a/src/root/search.tt b/src/root/search.tt index ba7aa52d..7607c2ba 100644 --- a/src/root/search.tt +++ b/src/root/search.tt @@ -12,7 +12,7 @@ [% FOREACH p IN projects %] - [% INCLUDE renderProjectName project=p.name %] + [% INCLUDE renderProjectName project=p.name %] [% HTML.escape(p.description) %] [% END %] @@ -32,7 +32,7 @@ [% FOREACH j IN jobsets %] - [% INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name %] + [% INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name %] [% HTML.escape(j.description) %] [% END %] @@ -52,7 +52,7 @@ [% FOREACH j IN jobs %] - [% INCLUDE renderFullJobName project=j.get_column('project') jobset=j.get_column('jobset') job=j.name %] + [% INCLUDE renderFullJobName project=j.get_column('project') jobset=j.get_column('jobset') job=j.name %] [% END %] diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css index 0866ef08..5f842feb 100644 --- a/src/root/static/css/hydra.css +++ b/src/root/static/css/hydra.css @@ -31,7 +31,7 @@ span:target > span.dep-tree-line { display: inline-block; /* required for webkit browsers */ } -span.disabled-project, span.disabled-jobset { +span.disabled-project, span.disabled-jobset, span.disabled-job { text-decoration: line-through; }