fix showing days in unhandled problems on main page (fixes #1265)

sni · Apr 7, 2023 · 0dabc7d · 0dabc7d
1 parent 7193402
commit 0dabc7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Thruk/Utils/Filter.pm b/lib/Thruk/Utils/Filter.pm
@@ -131,6 +131,8 @@ sub duration {
             $years     = int($duration/(365*86400));
             $duration = $duration%(365*86400);
         }
+    }
+    if($options == 4 || $options == 5 || $options == 6 || $options == 1) {
         if($duration >= 86400) {
             $days     = int($duration/86400);
             $duration = $duration%86400;

diff --git a/templates/main.tt b/templates/main.tt
@@ -228,7 +228,7 @@
               <td><a class="link" href="extinfo.cgi?type=1&amp;host=[% h.name | uri %]">[% h.name | html %]</a></td>
               <td class="flex justify-center"><div class="badge DOWN">DOWN</div></td>
               <td class="truncate w-1/2 max-w-0">[% h.plugin_output %]</td>
-              <td>[% duration(date.now - h.last_hard_state_change) %]</td>
+              <td>[% duration(date.now - h.last_hard_state_change, 6) %]</td>
             </tr>
             [% END %]
             [% IF problemhosts.size == 0 %]
@@ -272,7 +272,7 @@
               <td><a class="link" href="extinfo.cgi?type=2&amp;host=[% s.host_name | uri %]&amp;service=[% s.description | uri %]&amp;backend=[% s.peer_key | uri %]">[% s.description | html %]</a></td>
               <td class="flex justify-center"><div class="badge [% state %]">[% state %]</div></td>
               <td class="truncate w-1/2 max-w-0">[% s.plugin_output %]</td>
-              <td>[% duration(date.now - s.last_hard_state_change) %]</td>
+              <td>[% duration(date.now - s.last_hard_state_change, 6) %]</td>
             </tr>
             [% END %]
             [% IF problemservices.size == 0 %]