Add the next_try field to the worker job queue list

diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index 54d70b27d90ac9a46287f11ce0ff2ac6c108c05d..e309bfc64738fc83be81c3bc23fa422160378743 100644 (file)
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -56,13 +56,14 @@ class Queue extends BaseAdmin
                }
 
                // @TODO Move to Model\WorkerQueue::getEntries()
-               $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority', 'command'], $condition, ['limit' => 999, 'order' => ['created']]);
+               $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'next_try', 'priority', 'command'], $condition, ['limit' => 999, 'order' => ['created']]);
 
                $r = [];
                while ($entry = DBA::fetch($entries)) {
                        // fix GH-5469. ref: src/Core/Worker.php:217
                        $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');
                        $entry['created'] = DateTimeFormat::local($entry['created']);
+                       $entry['next_try'] = DateTimeFormat::local($entry['next_try']);
                        $r[] = $entry;
                }
                DBA::close($entries);
@@ -76,6 +77,7 @@ class Queue extends BaseAdmin
                        '$command_header' => DI::l10n()->t('Command'),
                        '$param_header' => DI::l10n()->t('Job Parameters'),
                        '$created_header' => DI::l10n()->t('Created'),
+                       '$next_try_header' => DI::l10n()->t('Next Try'),
                        '$prio_header' => DI::l10n()->t('Priority'),
                        '$info' => $info,
                        '$entries' => $r,

diff --git a/view/templates/admin/queue.tpl b/view/templates/admin/queue.tpl
index d50ff2082fcb3382dc3ff19d2841f773cd4e6967..c34f92f2cd96b13663f201d6145a7bb5d4495379 100644 (file)
--- a/view/templates/admin/queue.tpl
+++ b/view/templates/admin/queue.tpl
@@ -8,6 +8,7 @@
                        <th>{{$command_header}}</th>
                        <th>{{$param_header}}</th>
                        <th>{{$created_header}}</th>
+                       <th>{{$next_try_header}}</th>
                        <th>{{$prio_header}}</th>
                </tr>
                {{foreach $entries as $e}}
@@ -16,6 +17,7 @@
                        <td>{{$e.command}}</td>
                        <td>{{$e.parameter}}</td>
                        <td>{{$e.created}}</td>
+                       <td>{{$e.next_try}}</td>
                        <td>{{$e.priority}}</td>
                </tr>
                {{/foreach}}

diff --git a/view/theme/frio/templates/admin/queue.tpl b/view/theme/frio/templates/admin/queue.tpl
index 4ee60af1044fcc1f0fe7205029cac628f12f9240..8abc63d2eca4870c576e416ef2ba68f1d8399d56 100644 (file)
--- a/view/theme/frio/templates/admin/queue.tpl
+++ b/view/theme/frio/templates/admin/queue.tpl
@@ -8,6 +8,7 @@
                        <th>{{$command_header}}</th>
                        <th>{{$param_header}}</th>
                        <th>{{$created_header}}</th>
+                       <th>{{$next_try_header}}</th>
                        <th>{{$prio_header}}</th>
                </tr>
                {{foreach $entries as $e}}
@@ -16,6 +17,7 @@
                        <td>{{$e.command}}</td>
                        <td>{{$e.parameter}}</td>
                        <td>{{$e.created}}</td>
+                       <td>{{$e.next_try}}</td>
                        <td>{{$e.priority}}</td>
                </tr>
                {{/foreach}}