do not show ignored dupe jobs in job queue
This commit is contained in:
@@ -270,7 +270,9 @@ sub jq_complete {
|
||||
}
|
||||
|
||||
sub jq_log {
|
||||
return schema('netdisco')->resultset('Admin')->search({}, {
|
||||
return schema('netdisco')->resultset('Admin')->search({
|
||||
'me.log' => { '-not_like' => 'duplicate of %' },
|
||||
}, {
|
||||
prefetch => 'target',
|
||||
order_by => { -desc => [qw/entered device action/] },
|
||||
rows => (setting('jobs_qdepth') || 50),
|
||||
@@ -281,6 +283,7 @@ sub jq_userlog {
|
||||
my $user = shift;
|
||||
return schema('netdisco')->resultset('Admin')->search({
|
||||
username => $user,
|
||||
log => { '-not_like' => 'duplicate of %' },
|
||||
finished => { '>' => \"(now() - interval '5 seconds')" },
|
||||
})->with_times->all;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user