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

In the "My jobs" tab, ignore disabled projects/jobsets

Browse source
This commit is contained in:
Eelco Dolstra 2013-11-05 14:53:52 +01:00
parent 27b795f46e
commit 589271bd72
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/Hydra/Controller/User.pm
View file

@ -302,8 +302,12 @@ sub my_jobs_tab :Chained('user') :PathPart('my-jobs-tab') :Args(0) {
$c->stash->{builds} = [$c->model('DB::Builds')->search( $c->stash->{builds} = [$c->model('DB::Builds')->search(
{ iscurrent => 1 { iscurrent => 1
, maintainers => { ilike => "%" . $c->stash->{user}->emailaddress . "%" } , maintainers => { ilike => "%" . $c->stash->{user}->emailaddress . "%" }
, "project.enabled" => 1
, "jobset.enabled" => 1
}, },
{ order_by => ["project", "jobset", "job"] })]; { order_by => ["project", "jobset", "job"]
, join => ["project", "jobset"]
})];
} }

2
src/root/dashboard-my-jobs-tab.tt
View file

@ -9,7 +9,7 @@
[% ELSE %] [% ELSE %]
<p>Below is the most recent build of every job of which you <p>Below are the most recent builds of the [% builds.size %] jobs of which you
(<tt>[% HTML.escape(user.emailaddress) %]</tt>) are a maintainer.</p> (<tt>[% HTML.escape(user.emailaddress) %]</tt>) are a maintainer.</p>
[% INCLUDE renderBuildList %] [% INCLUDE renderBuildList %]