From c27fa94e8c303f7e1e3c633dc3a337f7d05c5e8a Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sun, 24 Sep 2023 20:56:56 +0100 Subject: [PATCH] also show unknown/unknown platforms and releases in inventory --- lib/App/Netdisco/Web/Plugin/Inventory.pm | 4 ++-- share/views/inventory.tt | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/App/Netdisco/Web/Plugin/Inventory.pm b/lib/App/Netdisco/Web/Plugin/Inventory.pm index cd5cd9ba..01636019 100644 --- a/lib/App/Netdisco/Web/Plugin/Inventory.pm +++ b/lib/App/Netdisco/Web/Plugin/Inventory.pm @@ -30,7 +30,6 @@ get '/inventory' => require_login sub { my %release_totals = map { $_ => {rows => scalar @{ $release_map{$_} }, count => 0} } - grep { $_ } keys %release_map; foreach my $r (keys %release_totals) { @@ -47,7 +46,6 @@ get '/inventory' => require_login sub { my %platform_totals = map { $_ => {rows => scalar @{ $platform_map{$_} }, count => 0} } - grep { $_ } keys %platform_map; foreach my $r (keys %platform_totals) { @@ -63,6 +61,8 @@ get '/inventory' => require_login sub { release_map => \%release_map, platform_totals => \%platform_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' }; }; diff --git a/share/views/inventory.tt b/share/views/inventory.tt index aa58815e..57aee5e0 100644 --- a/share/views/inventory.tt +++ b/share/views/inventory.tt @@ -44,11 +44,9 @@ [% END %] - [% IF row.vendor %] [% row.vendor | html_entity %] - [% ELSE %]unknown[% END %] [% IF row.model %] @@ -61,6 +59,9 @@ [% END %] [% END %] + [% IF unknown_platforms > 0 %] + Unknownunknown[% unknown_platforms %] + [% END %] @@ -108,11 +109,9 @@ [% END %] - [% IF row.os %] [% row.os | html_entity %] - [% ELSE %]unknown[% END %] [% IF row.os_ver %] @@ -125,6 +124,9 @@ [% END %] [% END %] + [% IF unknown_releases > 0 %] + Unknownunknown[% unknown_releases %] + [% END %]