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

parse cookie and set column defaults

Browse Source
This commit is contained in:
Oliver Gorwits
2013-09-05 23:48:04 +01:00
parent 05e6acfee5
commit 5bb8dc3bc1
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Makefile.PL
View File

@@ -36,6 +36,7 @@ requires 'Starman' => 0.3008;
requires 'SNMP::Info' => 3.05; requires 'SNMP::Info' => 3.05;
requires 'SQL::Translator' => 0.11016; requires 'SQL::Translator' => 0.11016;
requires 'Template' => 2.24; requires 'Template' => 2.24;
requires 'URL::Encode' => 0.01;
requires 'YAML' => 0.84; requires 'YAML' => 0.84;
requires 'YAML::XS' => 0.41; requires 'YAML::XS' => 0.41;
requires 'namespace::clean' => 0.24; requires 'namespace::clean' => 0.24;

50
Netdisco/lib/App/Netdisco/Web/Device.pm
View File

@@ -4,6 +4,7 @@ use Dancer ':syntax';
use Dancer::Plugin::Ajax; use Dancer::Plugin::Ajax;
use Dancer::Plugin::DBIC; use Dancer::Plugin::DBIC;
use Dancer::Plugin::Auth::Extensible; use Dancer::Plugin::Auth::Extensible;
use URL::Encode 'url_params_mixed';
hook 'before' => sub { hook 'before' => sub {
my @default_port_columns_left = ( my @default_port_columns_left = (
@@ -53,6 +54,36 @@ hook 'before' => sub {
return unless (request->path eq uri_for('/device')->path return unless (request->path eq uri_for('/device')->path
or index(request->path, uri_for('/ajax/content/device')->path) == 0); or index(request->path, uri_for('/ajax/content/device')->path) == 0);
# override ports form defaults with cookie settings
my $cookie = cookie('nd_ports-form');
my $cdata = url_params_mixed($cookie);
if ($cdata and ref {} eq ref $cdata) {
foreach my $item (@{ var('port_columns') }) {
my $key = $item->{name};
next unless defined $cdata->{$key}
and $cdata->{$key} =~ m/^[[:alnum:]_]+$/;
$item->{default} = $cdata->{$key};
}
foreach my $item (@{ var('connected_properties') }) {
my $key = $item->{name};
next unless defined $cdata->{$key}
and $cdata->{$key} =~ m/^[[:alnum:]_]+$/;
$item->{default} = $cdata->{$key};
}
foreach my $key (qw/age_num age_unit mac_format/) {
params->{$key} ||= $cdata->{$key}
if defined $cdata->{$key}
and $cdata->{$key} =~ m/^[[:alnum:]_]+$/;
}
}
# copy ports form defaults into request query params if this is
# a redirect from within the application (tab param is not set)
foreach my $col (@{ var('port_columns') }) { foreach my $col (@{ var('port_columns') }) {
next unless $col->{default} eq 'on'; next unless $col->{default} eq 'on';
params->{$col->{name}} = 'checked' params->{$col->{name}} = 'checked'
@@ -66,9 +97,9 @@ hook 'before' => sub {
} }
if (not param('tab') or param('tab') ne 'ports') { if (not param('tab') or param('tab') ne 'ports') {
params->{'age_num'} = 3; params->{'age_num'} ||= 3;
params->{'age_unit'} = 'months'; params->{'age_unit'} ||= 'months';
params->{'mac_format'} = 'IEEE'; params->{'mac_format'} ||= 'IEEE';
} }
}; };
@@ -76,12 +107,13 @@ hook 'before_template' => sub {
my $tokens = shift; my $tokens = shift;
# new searches will use these defaults in their sidebars # new searches will use these defaults in their sidebars
$tokens->{device_ports} = uri_for('/device', { $tokens->{device_ports} = uri_for('/device', { tab => 'ports' });
tab => 'ports',
age_num => 3, # copy ports form defaults into helper values for building template links
age_unit => 'months',
mac_format => 'IEEE', foreach my $key (qw/age_num age_unit mac_format/) {
}); $tokens->{device_ports}->query_param($key, params->{$key});
}
# for Net::MAC method # for Net::MAC method
$tokens->{mac_format_call} = 'as_'. params->{'mac_format'} $tokens->{mac_format_call} = 'as_'. params->{'mac_format'}