forked from lix-project/hydra
* Use isCurrent to determine the inactive jobs.
This commit is contained in:
parent
16f2d003b2
commit
08f3b7bf2a
|
@ -28,8 +28,16 @@ sub index : Chained('jobset') PathPart('') Args(0) {
|
||||||
|
|
||||||
getBuildStats($c, scalar $c->stash->{jobset}->builds);
|
getBuildStats($c, scalar $c->stash->{jobset}->builds);
|
||||||
|
|
||||||
$c->stash->{activeJobs} = [$c->stash->{jobset}->builds->search({isCurrent => 1}, {select => ["job"], distinct => 1})];
|
$c->stash->{activeJobs} = [
|
||||||
$c->stash->{inactiveJobs} = [$c->stash->{jobset}->jobs->search({active => 0})];
|
$c->stash->{jobset}->builds->search(
|
||||||
|
{isCurrent => 1},
|
||||||
|
{select => ["job"], order_by => ["job"], distinct => 1}
|
||||||
|
)];
|
||||||
|
$c->stash->{inactiveJobs} = [
|
||||||
|
$c->stash->{jobset}->builds->search(
|
||||||
|
{},
|
||||||
|
{select => ["job"], order_by => ["job"], group_by => ["job"], having => { 'sum(isCurrent)' => 0 }}
|
||||||
|
)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
|
|
||||||
<blockquote>
|
<blockquote>
|
||||||
[% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %]
|
[% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %]
|
||||||
[% FOREACH j IN inactiveJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.name %] [% END %]
|
[% FOREACH j IN inactiveJobs %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.get_column('job') %] [% END %]
|
||||||
</blockquote>
|
</blockquote>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
|
|
Loading…
Reference in a new issue