From f57ddee31c4995dcc9c3863e17afca269cb0137c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 2 May 2021 09:42:09 +0200 Subject: [PATCH] the command was missing from the worker queue overview --- src/Module/Admin/Queue.php | 3 ++- view/templates/admin/queue.tpl | 2 ++ view/theme/frio/templates/admin/queue.tpl | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php index 110a5424d5..f0883b361f 100644 --- a/src/Module/Admin/Queue.php +++ b/src/Module/Admin/Queue.php @@ -56,7 +56,7 @@ class Queue extends BaseAdmin } // @TODO Move to Model\WorkerQueue::getEntries() - $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['limit' => 999, 'order' => ['created']]); + $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority', 'command'], $condition, ['limit' => 999, 'order' => ['created']]); $r = []; while ($entry = DBA::fetch($entries)) { @@ -73,6 +73,7 @@ class Queue extends BaseAdmin '$page' => $sub_title, '$count' => count($r), '$id_header' => DI::l10n()->t('ID'), + '$command_header' => DI::l10n()->t('Command'), '$param_header' => DI::l10n()->t('Job Parameters'), '$created_header' => DI::l10n()->t('Created'), '$prio_header' => DI::l10n()->t('Priority'), diff --git a/view/templates/admin/queue.tpl b/view/templates/admin/queue.tpl index 5bab58a5e9..d50ff2082f 100644 --- a/view/templates/admin/queue.tpl +++ b/view/templates/admin/queue.tpl @@ -5,6 +5,7 @@ + @@ -12,6 +13,7 @@ {{foreach $entries as $e}} + diff --git a/view/theme/frio/templates/admin/queue.tpl b/view/theme/frio/templates/admin/queue.tpl index ab076a0f73..4ee60af104 100644 --- a/view/theme/frio/templates/admin/queue.tpl +++ b/view/theme/frio/templates/admin/queue.tpl @@ -5,6 +5,7 @@
{{$id_header}}{{$command_header}} {{$param_header}} {{$created_header}} {{$prio_header}}
{{$e.id}}{{$e.command}} {{$e.parameter}} {{$e.created}} {{$e.priority}}
+ @@ -12,6 +13,7 @@ {{foreach $entries as $e}} +
{{$id_header}}{{$command_header}} {{$param_header}} {{$created_header}} {{$prio_header}}
{{$e.id}}{{$e.command}} {{$e.parameter}} {{$e.created}} {{$e.priority}}