135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend field in jobqueue (#1114)

Browse Source 
implements #969
This commit is contained in:
Oliver Gorwits
2023-10-24 21:49:37 +01:00
committed by GitHub
parent d6e36dcad0
commit 21bc8cf63e
13 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm
View File

@@ -32,10 +32,14 @@ ajax '/ajax/content/admin/jobqueue' => require_role admin => sub {
content_type('text/html');
my $jq_total = schema(vars->{'tenant'})->resultset('Admin')->count();
my $jq_queued = schema(vars->{'tenant'})->resultset('Admin')->search({status => 'queued'})->count();
my $jq_running = schema(vars->{'tenant'})->resultset('Admin')->search({status => { -like => 'queued-%'}})->count();
my $jq_done = schema(vars->{'tenant'})->resultset('Admin')->search({status => 'done'})->count();
my $jq_errored = schema(vars->{'tenant'})->resultset('Admin')->search({status => 'error'})->count();
my $jq_queued = schema(vars->{'tenant'})->resultset('Admin')
->search({status => 'queued', backend => undef })->count();
my $jq_running = schema(vars->{'tenant'})->resultset('Admin')
->search({status => 'queued', backend => { '!=' => undef }})->count();
my $jq_done = schema(vars->{'tenant'})->resultset('Admin')
->search({status => 'done'})->count();
my $jq_errored = schema(vars->{'tenant'})->resultset('Admin')
->search({status => 'error'})->count();
template 'ajax/admintask/jobqueue.tt', {
jq_total => commify($jq_total || 0),

5
lib/App/Netdisco/Web/TypeAhead.pm
View File

@@ -87,10 +87,7 @@ ajax '/ajax/data/queue/typeahead/status' => require_role admin => sub {
my $q = quotemeta( param('query') || param('term') || param('status') );
my @actions =
grep { $q ? m/^$q/ : true }
List::MoreUtils::uniq
sort
grep { defined }
qw(Queued Done Info Deferred Error);
qw(Queued Running Done Info Deferred Error);
content_type 'application/json';
to_json \@actions;