Show next_try only for the deferred worker job.

diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index e309bfc64738fc83be81c3bc23fa422160378743..dafa278e794b1144052554c3b5e449418e99d544 100644 (file)
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -80,6 +80,7 @@ class Queue extends BaseAdmin
                        '$next_try_header' => DI::l10n()->t('Next Try'),
                        '$prio_header' => DI::l10n()->t('Priority'),
                        '$info' => $info,
+                       '$status' => $status,
                        '$entries' => $r,
                ]);
        }

diff --git a/view/templates/admin/queue.tpl b/view/templates/admin/queue.tpl
index c34f92f2cd96b13663f201d6145a7bb5d4495379..5ac38490d3e482f5599b6da7941a5d2e6ff25198 100644 (file)
--- a/view/templates/admin/queue.tpl
+++ b/view/templates/admin/queue.tpl
@@ -8,7 +8,7 @@
                        <th>{{$command_header}}</th>
                        <th>{{$param_header}}</th>
                        <th>{{$created_header}}</th>
-                       <th>{{$next_try_header}}</th>
+                       {{if ($status==='deferred') }}<th>{{$next_try_header}}</th>{{/if}}
                        <th>{{$prio_header}}</th>
                </tr>
                {{foreach $entries as $e}}
@@ -17,7 +17,7 @@
                        <td>{{$e.command}}</td>
                        <td>{{$e.parameter}}</td>
                        <td>{{$e.created}}</td>
-                       <td>{{$e.next_try}}</td>
+                       {{if ($status==='deferred') }}<td>{{$e.next_try}}</td>{{/if}}
                        <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 8abc63d2eca4870c576e416ef2ba68f1d8399d56..f9aaaa0e96d60c47dd068bfdcc5acf810b6c6b35 100644 (file)
--- a/view/theme/frio/templates/admin/queue.tpl
+++ b/view/theme/frio/templates/admin/queue.tpl
@@ -8,7 +8,7 @@
                        <th>{{$command_header}}</th>
                        <th>{{$param_header}}</th>
                        <th>{{$created_header}}</th>
-                       <th>{{$next_try_header}}</th>
+                       {{if ($status==='deferred') }}<th>{{$next_try_header}}</th>{{/if}}
                        <th>{{$prio_header}}</th>
                </tr>
                {{foreach $entries as $e}}
@@ -17,7 +17,7 @@
                        <td>{{$e.command}}</td>
                        <td>{{$e.parameter}}</td>
                        <td>{{$e.created}}</td>
-                       <td>{{$e.next_try}}</td>
+                       {{if ($status==='deferred') }}<td>{{$e.next_try}}</td>{{/if}}
                        <td>{{$e.priority}}</td>
                </tr>
                {{/foreach}}