standardize variable names

This commit is contained in:
Eric A. Miller
2014-05-28 23:52:08 -04:00
parent cff24e4834
commit 2111a4079b
15 changed files with 32 additions and 31 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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, ",");
}
}

View File

@@ -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));
}
}

View File

@@ -70,12 +70,12 @@ $(document).ready(function() {
"columns": [
{
"data": 'domain',
"render": function(data, type, full, meta) {
"render": function(data, type, row, meta) {
return '<a href="[% uri_for('/report/netbios') %]?domain=' + encodeURIComponent(data || 'blank') + '">' + he.encode(data || '(Blank Domain)') + '</a>';
}
}, {
"data": 'count',
"render": function(data, type, full, meta) {
"render": function(data, type, row, meta) {
return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}

View File

@@ -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, ",");
}
}

View File

@@ -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 '<a href="[% uri_for('/report/portssid') %]?ssid=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>';
}
}, {
"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, ",");
}
},

View File

@@ -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, ",");
}
}

View File

@@ -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, ",");
}
}