135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct date formatting and logic in IP Inventory report

Browse Source
This commit is contained in:
Eric A. Miller
2014-02-03 22:17:06 -05:00
parent 68f0b0fffb
commit 279924d2fb
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Netdisco/share/views/ajax/report/ipinventory.tt
View File

@@ -21,17 +21,7 @@
<td>[% row.ip | html_entity %]</td>
[% END %]
<td class="nd_center-cell">[% row.dns | html_entity %]</td>
[% IF row.age %]
[% age = row.age.replace('mon', 'month') %]
[% IF age.match('(day|month|year)') %]
[% age = age.remove('(-)?\d{2}:\d{2}.*$') %]
[% ELSE %]
[% age = age.replace('(\d{2}:\d{2}):\d{2}(\.\d*)$', '$1') %]
[% END %]
[% ELSE %]
[% age = 'Never' %]
[% END %]
<td class="nd_center-cell">[% age | html_entity %]</td>
<td class="nd_center-cell">[% row.age || 'Never' | html_entity %]</td>
<td class="nd_center-cell">[% row.time_first || 'Never' | html_entity %]</td>
</tr>
[% END %]