[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] Make scheduler log times more legible

Jonny Bradley pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki


Commits:
4e977a5c by Jonny Bradley at 2026-01-28T15:41:49+00:00
Make scheduler log times more legible
---
* [FIX] scheduler: Correect indentation on tab 3 (logs)
Mainly to see if this will unstick the merge train (been merging for over 3 hours)

* [FIX] scheduler: Don't use "same day" option when formatting scheduler timestamps (thanks @jyhem)

See merge request tikiwiki/tiki!9425


(cherry picked from commit c2bf889a315f0754924132d33d00a9ed48b51a09)

d613ea4b [FIX] scheduler: Don't use "same day" option when formatting scheduler timestamps (thanks @jyhem)
04ea5cac [FIX] scheduler: Correect indentation on tab 3 (logs)

Co-authored-by: Jonny Bradley <[email protected]>
- - - - -


1 changed file:

- templates/tiki-admin_schedulers.tpl


Changes:

=====================================
templates/tiki-admin_schedulers.tpl
=====================================
@@ -241,69 +241,69 @@
     </form>
 {/tab}
 
-    <a id="tab3"></a>
-    {if isset($schedulerinfo.id) && $schedulerinfo.id}
-        {tab name="{tr}Scheduler logs{/tr}"}
-            <h2>{tr}Scheduler{/tr} {$schedulerinfo.name|escape} Logs</h2>
-            <h3>{tr}Last {$numOfLogs} Logs{/tr}</h3>
-            <div class="table-responsive">
-                <table class="table normal table-striped table-hover">
-                    <thead>
+<a id="tab3"></a>
+{if isset($schedulerinfo.id) && $schedulerinfo.id}
+    {tab name="{tr}Scheduler logs{/tr}"}
+        <h2>{tr}Scheduler{/tr} {$schedulerinfo.name|escape} Logs</h2>
+        <h3>{tr}Last {$numOfLogs} Logs{/tr}</h3>
+        <div class="table-responsive">
+            <table class="table normal table-striped table-hover">
+                <thead>
+                <tr>
+                    <th>ID</th>
+                    <th>Start Time</th>
+                    <th>End Time</th>
+                    <th>Status</th>
+                    <th>Output</th>
+                </tr>
+                </thead>
+                <tbody>
+                {section name=run loop=$schedulerruns}
                     <tr>
-                        <th>ID</th>
-                        <th>Start Time</th>
-                        <th>End Time</th>
-                        <th>Status</th>
-                        <th>Output</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {section name=run loop=$schedulerruns}
-                        <tr>
-                            <td>{$schedulerruns[run].id}</td>
-                            <td>
-                                {$schedulerruns[run].start_time|tiki_short_datetime} ({$display_timezone})
+                        <td>{$schedulerruns[run].id}</td>
+                        <td>
+                            {$schedulerruns[run].start_time|tiki_short_datetime:'':'n'} ({$display_timezone})
+                            {if $display_timezone ne 'UTC'}
+                                <br>{$schedulerruns[run].start_time|tiki_short_datetime:'':'n':'UTC'} (UTC)
+                            {/if}
+                        </td>
+                        <td>
+                            {if $schedulerruns[run].end_time ne null}
+                                {$schedulerruns[run].end_time|tiki_short_datetime:'':'n'} ({$display_timezone})
                                 {if $display_timezone ne 'UTC'}
-                                    <br>{$schedulerruns[run].start_time|tiki_short_datetime:'':'y':'UTC'} (UTC)
+                                    <br>{$schedulerruns[run].end_time|tiki_short_datetime:'':'n':'UTC'} (UTC)
                                 {/if}
-                            </td>
-                            <td>
-                                {if $schedulerruns[run].end_time ne null}
-                                    {$schedulerruns[run].end_time|tiki_short_datetime} ({$display_timezone})
-                                    {if $display_timezone ne 'UTC'}
-                                        <br>{$schedulerruns[run].end_time|tiki_short_datetime:'':'y':'UTC'} (UTC)
-                                    {/if}
-                                {/if}
-                            </td>
-                            <td>
-                                {if $schedulerruns[run].status eq 'running'}
-                                    <span class="badge bg-warning">{tr}Running{/tr}</span>
-                                {/if}
-                                {if $schedulerruns[run].status eq 'failed'}
-                                    <span class="badge bg-danger">{tr}Failed{/tr}</span>
+                            {/if}
+                        </td>
+                        <td>
+                            {if $schedulerruns[run].status eq 'running'}
+                                <span class="badge bg-warning">{tr}Running{/tr}</span>
+                            {/if}
+                            {if $schedulerruns[run].status eq 'failed'}
+                                <span class="badge bg-danger">{tr}Failed{/tr}</span>
 
-                                {/if}
-                                {if $schedulerruns[run].status eq 'done'}
-                                    <span class="badge bg-success">{tr}Done{/tr}</span>
-                                {/if}
-                            </td>
-                            <td>
-                                {if isset($schedulerruns[run].can_stop) && $schedulerruns[run].can_stop}
-                                    <a class="btn btn-secondary btn-sm" href="{bootstrap_modal controller=scheduler action=reset schedulerId=$schedulerruns[run].scheduler_id startTime=$schedulerruns[run].start_time}">
-                                    {icon name="undo" _menu_text='y' _menu_icon='y' alt="{tr}Reset{/tr}"}
-                                    </a>
-                                {else}
-                                    {$schedulerruns[run].output|nl2br}
-                                {/if}
-                            </td>
-                        </tr>
-                    {/section}
-                    </tbody>
-                </table>
-            </div>
-            {pagination_links count=$count step=$numrows offset=$offset}tiki-admin_schedulers.php?scheduler={$schedulerinfo.id}&cookietab=3{/pagination_links}
-        {/tab}
-    {/if}
+                            {/if}
+                            {if $schedulerruns[run].status eq 'done'}
+                                <span class="badge bg-success">{tr}Done{/tr}</span>
+                            {/if}
+                        </td>
+                        <td>
+                            {if isset($schedulerruns[run].can_stop) && $schedulerruns[run].can_stop}
+                                <a class="btn btn-secondary btn-sm" href="{bootstrap_modal controller=scheduler action=reset schedulerId=$schedulerruns[run].scheduler_id startTime=$schedulerruns[run].start_time}">
+                                {icon name="undo" _menu_text='y' _menu_icon='y' alt="{tr}Reset{/tr}"}
+                                </a>
+                            {else}
+                                {$schedulerruns[run].output|nl2br}
+                            {/if}
+                        </td>
+                    </tr>
+                {/section}
+                </tbody>
+            </table>
+        </div>
+        {pagination_links count=$count step=$numrows offset=$offset}tiki-admin_schedulers.php?scheduler={$schedulerinfo.id}&cookietab=3{/pagination_links}
+    {/tab}
+{/if}
 
 <a id="tab4"></a>
 {if $jobs|count > 0}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4e977a5ceeeb1489e6a13319095641100a62b8f1

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4e977a5ceeeb1489e6a13319095641100a62b8f1
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs