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

some older cisco devices report a numeric value for class, ignore null as a class

Browse Source
This commit is contained in:
Eric A. Miller
2014-05-29 23:02:16 -04:00
parent 669333d490
commit 8ddd5c3d2d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
View File

@@ -88,7 +88,7 @@ get '/ajax/content/report/moduleinventory' => require_login sub {
} }
else { else {
@results = $rs->search( @results = $rs->search(
{}, {class => { '!=', undef }},
{ select => [ 'class', { count => 'class' } ], { select => [ 'class', { count => 'class' } ],
as => [qw/ class count /], as => [qw/ class count /],
group_by => [qw/ class /] group_by => [qw/ class /]

4
Netdisco/share/views/ajax/report/moduleinventory.tt
View File

@@ -65,7 +65,7 @@ $(document).ready(function() {
}, { }, {
"data": 'class', "data": 'class',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data)) + '</a>'; return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data + '')) + '</a>';
} }
}, { }, {
"data": 'type', "data": 'type',
@@ -101,7 +101,7 @@ $(document).ready(function() {
[% ELSE %] { [% ELSE %] {
"data": 'class', "data": 'class',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data)) + '</a>'; return '<a href="[% uri_for('/report/moduleinventory') %]?class=' + encodeURIComponent(data) + '">' + he.encode(capitalizeFirstLetter(data + '')) + '</a>';
} }
}, { }, {
"data": 'count', "data": 'count',