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

also show unknown/unknown platforms and releases in inventory

Browse Source
This commit is contained in:
Oliver Gorwits
2023-09-24 20:56:56 +01:00
parent 2e01ec9f2d
commit c27fa94e8c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/Web/Plugin/Inventory.pm
View File

@@ -30,7 +30,6 @@ get '/inventory' => require_login sub {
my %release_totals = my %release_totals =
map { $_ => {rows => scalar @{ $release_map{$_} }, count => 0} } map { $_ => {rows => scalar @{ $release_map{$_} }, count => 0} }
grep { $_ }
keys %release_map; keys %release_map;
foreach my $r (keys %release_totals) { foreach my $r (keys %release_totals) {
@@ -47,7 +46,6 @@ get '/inventory' => require_login sub {
my %platform_totals = my %platform_totals =
map { $_ => {rows => scalar @{ $platform_map{$_} }, count => 0} } map { $_ => {rows => scalar @{ $platform_map{$_} }, count => 0} }
grep { $_ }
keys %platform_map; keys %platform_map;
foreach my $r (keys %platform_totals) { foreach my $r (keys %platform_totals) {
@@ -63,6 +61,8 @@ get '/inventory' => require_login sub {
release_map => \%release_map, release_map => \%release_map,
platform_totals => \%platform_totals, platform_totals => \%platform_totals,
release_totals => \%release_totals, release_totals => \%release_totals,
unknown_platforms => (scalar grep { not $_->{vendor} } $platforms->hri->all),
unknown_releases => (scalar grep { not $_->{os} } $releases->hri->all),
}, { layout => 'main' }; }, { layout => 'main' };
}; };

10
share/views/inventory.tt
View File

@@ -44,11 +44,9 @@
<tr> <tr>
[% END %] [% END %]
<th> <th>
[% IF row.vendor %]
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device | none %]&q=[% row.vendor | uri %]&vendor=[% row.vendor | uri %]"> href="[% search_device | none %]&q=[% row.vendor | uri %]&vendor=[% row.vendor | uri %]">
[% row.vendor | html_entity %]</a> [% row.vendor | html_entity %]</a>
[% ELSE %]unknown[% END %]
</th> </th>
<th> <th>
[% IF row.model %] [% IF row.model %]
@@ -61,6 +59,9 @@
</tr> </tr>
[% END %] [% END %]
[% END %] [% END %]
[% IF unknown_platforms > 0 %]
<tr><th>Unknown</th><th>unknown</th><th>[% unknown_platforms %]</th></tr>
[% END %]
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -108,11 +109,9 @@
<tr> <tr>
[% END %] [% END %]
<th> <th>
[% IF row.os %]
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device | none %]&q=[% row.os | uri %]&os=[% row.os | uri %]"> href="[% search_device | none %]&q=[% row.os | uri %]&os=[% row.os | uri %]">
[% row.os | html_entity %]</a> [% row.os | html_entity %]</a>
[% ELSE %]unknown[% END %]
</th> </th>
<th> <th>
[% IF row.os_ver %] [% IF row.os_ver %]
@@ -125,6 +124,9 @@
</tr> </tr>
[% END %] [% END %]
[% END %] [% END %]
[% IF unknown_releases > 0 %]
<tr><th>Unknown</th><th>unknown</th><th>[% unknown_releases %]</th></tr>
[% END %]
</tbody> </tbody>
</table> </table>
</div> </div>