diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
index d1e86323..880a5567 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
@@ -27,8 +27,8 @@ get '/ajax/content/report/deviceaddrnodns' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json (\@results);
- template 'ajax/report/deviceaddrnodns.tt', { results => $results, },
+ my $json = to_json (\@results);
+ template 'ajax/report/deviceaddrnodns.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
index 86cdeb8c..32c724f2 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
@@ -23,8 +23,8 @@ get '/ajax/content/report/devicebylocation' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json( \@results );
- template 'ajax/report/devicebylocation.tt', { results => $results },
+ my $json = to_json( \@results );
+ template 'ajax/report/devicebylocation.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
index 96ecf5e0..8b4eb63a 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
@@ -26,8 +26,8 @@ get '/ajax/content/report/devicednsmismatch' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json( \@results );
- template 'ajax/report/devicednsmismatch.tt', { results => $results },
+ my $json = to_json( \@results );
+ template 'ajax/report/devicednsmismatch.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
index 5755781a..e32cf4a2 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
@@ -100,10 +100,11 @@ get '/ajax/content/report/moduleinventory' => require_login sub {
}
return unless scalar @results;
+
if ( request->is_ajax ) {
- my $results = to_json (\@results);
+ my $json = to_json (\@results);
template 'ajax/report/moduleinventory.tt',
- { results => $results, opt => $has_opt },
+ { results => $json, opt => $has_opt },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
index 77000540..8c9c4eea 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
@@ -30,8 +30,8 @@ get '/ajax/content/report/portadmindown' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json (\@results);
- template 'ajax/report/portadmindown.tt', { results => $results, },
+ my $json = to_json (\@results);
+ template 'ajax/report/portadmindown.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
index c96b36ab..23e17127 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
@@ -30,8 +30,8 @@ get '/ajax/content/report/portblocking' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json (\@results);
- template 'ajax/report/portblocking.tt', { results => $results, },
+ my $json = to_json (\@results);
+ template 'ajax/report/portblocking.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
index e99285b3..9c335b4a 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
@@ -36,8 +36,8 @@ get '/ajax/content/report/portmultinodes' => require_login sub {
return unless scalar @results;
if ( request->is_ajax ) {
- my $results = to_json (\@results);
- template 'ajax/report/portmultinodes.tt', { results => $results, },
+ my $json = to_json (\@results);
+ template 'ajax/report/portmultinodes.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
index 05b22af6..124519c6 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
@@ -19,8 +19,8 @@ get '/ajax/content/report/portutilization' => require_login sub {
my @results = schema('netdisco')->resultset('Virtual::PortUtilization')->hri->all;
if (request->is_ajax) {
- my $results = to_json (\@results);
- template 'ajax/report/portutilization.tt', { results => $results, },
+ my $json = to_json (\@results);
+ template 'ajax/report/portutilization.tt', { results => $json },
{ layout => undef };
}
else {
diff --git a/Netdisco/share/views/ajax/report/apchanneldist.tt b/Netdisco/share/views/ajax/report/apchanneldist.tt
index b5215228..0b63db2a 100644
--- a/Netdisco/share/views/ajax/report/apchanneldist.tt
+++ b/Netdisco/share/views/ajax/report/apchanneldist.tt
@@ -19,7 +19,7 @@ $(document).ready(function() {
}, {
"data": 'ch_count',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}
diff --git a/Netdisco/share/views/ajax/report/halfduplex.tt b/Netdisco/share/views/ajax/report/halfduplex.tt
index f9d9a2e2..31806ab5 100644
--- a/Netdisco/share/views/ajax/report/halfduplex.tt
+++ b/Netdisco/share/views/ajax/report/halfduplex.tt
@@ -34,7 +34,7 @@ $(document).ready(function() {
"data": 'duplex',
"searchable": false,
"orderable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return he.encode(capitalizeFirstLetter(data));
}
}
diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt
index 5668a0f5..a484f0d4 100644
--- a/Netdisco/share/views/ajax/report/netbios.tt
+++ b/Netdisco/share/views/ajax/report/netbios.tt
@@ -70,12 +70,12 @@ $(document).ready(function() {
"columns": [
{
"data": 'domain',
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return '' + he.encode(data || '(Blank Domain)') + '';
}
}, {
"data": 'count',
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}
diff --git a/Netdisco/share/views/ajax/report/portmultinodes.tt b/Netdisco/share/views/ajax/report/portmultinodes.tt
index c1d22ec5..e8985d63 100644
--- a/Netdisco/share/views/ajax/report/portmultinodes.tt
+++ b/Netdisco/share/views/ajax/report/portmultinodes.tt
@@ -34,7 +34,7 @@ $(document).ready(function() {
}, {
"data": 'mac_count',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}
diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/Netdisco/share/views/ajax/report/portssid.tt
index 6aeeea8f..4429ec4f 100644
--- a/Netdisco/share/views/ajax/report/portssid.tt
+++ b/Netdisco/share/views/ajax/report/portssid.tt
@@ -37,7 +37,7 @@ $(document).ready(function() {
}
}, {
"data": 'broadcast',
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return (data ? 'Yes' : 'No');
}
}, {
@@ -63,18 +63,18 @@ $(document).ready(function() {
"columns": [
{
"data": 'ssid',
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return '' + he.encode(data) + '';
}
}, {
"data": 'broadcast',
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return (data ? 'Yes' : 'No');
}
}, {
"data": 'count',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
},
diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/Netdisco/share/views/ajax/report/portutilization.tt
index 31489df9..c2a76a4f 100644
--- a/Netdisco/share/views/ajax/report/portutilization.tt
+++ b/Netdisco/share/views/ajax/report/portutilization.tt
@@ -24,25 +24,25 @@ $(document).ready(function() {
}, {
"data": 'port_count',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}, {
"data": 'ports_in_use',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}, {
"data": 'ports_shutdown',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}, {
"data": 'ports_free',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}
diff --git a/Netdisco/share/views/ajax/report/vlaninventory.tt b/Netdisco/share/views/ajax/report/vlaninventory.tt
index ca072f1e..5321539f 100644
--- a/Netdisco/share/views/ajax/report/vlaninventory.tt
+++ b/Netdisco/share/views/ajax/report/vlaninventory.tt
@@ -28,13 +28,13 @@ $(document).ready(function() {
}, {
"data": 'dcount',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}, {
"data": 'pcount',
"searchable": false,
- "render": function(data, type, full, meta) {
+ "render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}