Change node netbios report by domain to use server-side processing
This commit is contained in:
@@ -3,6 +3,7 @@ package App::Netdisco::Web::Plugin::Report::Netbios;
|
|||||||
use Dancer ':syntax';
|
use Dancer ':syntax';
|
||||||
use Dancer::Plugin::DBIC;
|
use Dancer::Plugin::DBIC;
|
||||||
use Dancer::Plugin::Auth::Extensible;
|
use Dancer::Plugin::Auth::Extensible;
|
||||||
|
use App::Netdisco::Util::ExpandParams 'expand_hash';
|
||||||
|
|
||||||
use App::Netdisco::Web::Plugin;
|
use App::Netdisco::Web::Plugin;
|
||||||
|
|
||||||
@@ -34,33 +35,64 @@ hook 'before_template' => sub {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
get '/ajax/content/report/netbios' => require_login sub {
|
get '/ajax/content/report/netbios/data' => require_login sub {
|
||||||
|
send_error( 'Missing parameter', 400 )
|
||||||
|
unless ( param('draw') && param('draw') =~ /\d+/ );
|
||||||
|
|
||||||
my $domain = param('domain');
|
my $domain = param('domain');
|
||||||
|
|
||||||
my $rs = schema('netdisco')->resultset('NodeNbt');
|
my $rs = schema('netdisco')->resultset('NodeNbt');
|
||||||
|
|
||||||
if ( defined $domain ) {
|
my $search = $domain eq 'blank' ? '' : $domain;
|
||||||
|
$rs = $rs->search( { domain => $search } )
|
||||||
|
->order_by( [ { -asc => 'domain' }, { -desc => 'time_last' } ] );
|
||||||
|
|
||||||
|
my $exp_params = expand_hash( scalar params );
|
||||||
|
|
||||||
|
my $recordsTotal = $rs->count;
|
||||||
|
|
||||||
|
my @data = $rs->get_datatables_data($exp_params)->hri->all;
|
||||||
|
|
||||||
|
my $recordsFiltered = $rs->get_datatables_filtered_count($exp_params);
|
||||||
|
|
||||||
|
content_type 'application/json';
|
||||||
|
return to_json(
|
||||||
|
{ draw => int( param('draw') ),
|
||||||
|
recordsTotal => int($recordsTotal),
|
||||||
|
recordsFiltered => int($recordsFiltered),
|
||||||
|
data => \@data,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
get '/ajax/content/report/netbios' => require_login sub {
|
||||||
|
|
||||||
|
my $domain = param('domain');
|
||||||
|
|
||||||
|
my $rs = schema('netdisco')->resultset('NodeNbt');
|
||||||
|
my @results;
|
||||||
|
|
||||||
|
if ( defined $domain && !request->is_ajax ) {
|
||||||
my $search = $domain eq 'blank' ? '' : $domain;
|
my $search = $domain eq 'blank' ? '' : $domain;
|
||||||
$rs
|
@results
|
||||||
= $rs->search( { domain => $search } )
|
= $rs->search( { domain => $search } )
|
||||||
->order_by( [ { -asc => 'domain' }, { -desc => 'time_last' } ] )
|
->order_by( [ { -asc => 'domain' }, { -desc => 'time_last' } ] )
|
||||||
->hri;
|
->hri->all;
|
||||||
|
|
||||||
|
return unless scalar @results;
|
||||||
}
|
}
|
||||||
else {
|
elsif ( !defined $domain ) {
|
||||||
$rs = $rs->search(
|
@results = $rs->search(
|
||||||
{},
|
{},
|
||||||
{ select => [ 'domain', { count => 'domain' } ],
|
{ select => [ 'domain', { count => 'domain' } ],
|
||||||
as => [qw/ domain count /],
|
as => [qw/ domain count /],
|
||||||
group_by => [qw/ domain /]
|
group_by => [qw/ domain /]
|
||||||
}
|
}
|
||||||
)->order_by( { -desc => 'count' } )->hri;
|
)->order_by( { -desc => 'count' } )->hri->all;
|
||||||
|
|
||||||
|
return unless scalar @results;
|
||||||
}
|
}
|
||||||
|
|
||||||
my @results = $rs->all;
|
|
||||||
return unless scalar @results;
|
|
||||||
|
|
||||||
if ( request->is_ajax ) {
|
if ( request->is_ajax ) {
|
||||||
my $json = to_json( \@results );
|
my $json = to_json( \@results );
|
||||||
template 'ajax/report/netbios.tt',
|
template 'ajax/report/netbios.tt',
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
[% USE url %]
|
||||||
[% IF opt %]
|
[% IF opt %]
|
||||||
<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
|
<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
|
||||||
<thead>
|
<thead>
|
||||||
@@ -25,11 +26,16 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
var table = $('#data-table').dataTable({
|
var table = $('#data-table').dataTable({
|
||||||
"deferRender": true,
|
"processing": true,
|
||||||
"stateSave": true,
|
"stateSave": true,
|
||||||
"pageLength": 25,
|
"pageLength": 25,
|
||||||
"data": [% results %],
|
"language": {
|
||||||
|
"search": 'Filter records: '
|
||||||
|
},
|
||||||
[% IF opt %]
|
[% IF opt %]
|
||||||
|
"serverSide": true,
|
||||||
|
"order": [[ 0, "desc" ]],
|
||||||
|
"ajax": '/ajax/content/report/netbios/data?[% url(params('query').hash) %]',
|
||||||
"columns": [
|
"columns": [
|
||||||
{
|
{
|
||||||
"data": 'domain',
|
"data": 'domain',
|
||||||
@@ -69,6 +75,8 @@ $(document).ready(function() {
|
|||||||
],
|
],
|
||||||
"order": [[0, "asc"], [5, "desc"]]
|
"order": [[0, "asc"], [5, "desc"]]
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
|
"deferRender": true,
|
||||||
|
"data": [% results %],
|
||||||
"columns": [
|
"columns": [
|
||||||
{
|
{
|
||||||
"data": 'domain',
|
"data": 'domain',
|
||||||
|
|||||||
Reference in New Issue
Block a user