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

...and remove old code using age_on flag

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-03 23:35:46 +00:00
parent 04f0125b4f
commit 652bd171d6
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
View File

@@ -42,9 +42,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
$subnet = NetAddr::IP::Lite->new('0.0.0.0/32') $subnet = NetAddr::IP::Lite->new('0.0.0.0/32')
if (! $subnet) or ($subnet->addr eq '0.0.0.0'); if (! $subnet) or ($subnet->addr eq '0.0.0.0');
my $age = param('age_on') || '0';
my $agenot = param('age_invert') || '0'; my $agenot = param('age_invert') || '0';
my ( $start, $end ) = param('daterange') =~ /(\d+-\d+-\d+)/gmx; my ( $start, $end ) = param('daterange') =~ /(\d+-\d+-\d+)/gmx;
my $limit = param('limit') || 256; my $limit = param('limit') || 256;
@@ -129,7 +127,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
)->as_query; )->as_query;
my $rs; my $rs;
if ( $age && $start && $end ) { if ( $start && $end ) {
$start = $start . ' 00:00:00'; $start = $start . ' 00:00:00';
$end = $end . ' 23:59:59'; $end = $end . ' 23:59:59';

2
Netdisco/share/views/ajax/report/subnets.tt
View File

@@ -13,7 +13,7 @@
</tbody> </tbody>
[% FOREACH row IN results.all %] [% FOREACH row IN results.all %]
<tr> <tr>
<td class="nd_center-cell"><a href="[% uri_for('/report/ipinventory') %]?subnet=[% row.subnet | uri %]&daterange=[% daterange | uri %]&limit=[% row.subnet_size | uri %]&age_on=on"> <td class="nd_center-cell"><a href="[% uri_for('/report/ipinventory') %]?subnet=[% row.subnet | uri %]&daterange=[% daterange | uri %]&limit=[% row.subnet_size | uri %]">
[% row.subnet | html_entity %]</a></td> [% row.subnet | html_entity %]</a></td>
<td class="nd_center-cell">[% row.subnet_size | html_entity %]</td> <td class="nd_center-cell">[% row.subnet_size | html_entity %]</td>
<td class="nd_center-cell">[% row.active | html_entity %]</td> <td class="nd_center-cell">[% row.active | html_entity %]</td>

12
Netdisco/share/views/js/report.js
View File

@@ -45,16 +45,4 @@
,delay: 250 ,delay: 250
,minLength: 3 ,minLength: 3
}); });
// change color of daterange input when activated
$('#age_on').change(function() {
if ($(this).is(':checked')) {
$('#daterange').parent('.clearfix').addClass('success');
}
else {
$('#daterange').parent('.clearfix').removeClass('success');
}
});
// fire the event to set success class correctly on page load
$('#age_on').change();
}); });