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

switch to using defaults all the time instead of params, so multi tab works

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-10 13:38:54 +00:00
parent f8cee4cff6
commit b8ab3b396c
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/App/Netdisco/Web.pm
View File

@@ -11,6 +11,8 @@ use HTML::Entities (); # to ensure dependency is met
use URI::QueryParam (); # part of URI, to add helper methods
use Path::Class 'dir';
use Module::Load ();
use Storable 'dclone';
use Scope::Guard 'guard';
use App::Netdisco::Util::Web 'interval_to_daterange';
use App::Netdisco::Web::AuthN;
@@ -79,14 +81,13 @@ hook 'before' => sub {
$key =~ s|.*/(\w+)/(\w+)$|${1}_${2}|;
vars->{'sidebar_key'} = $key;
return unless param('firstsearch')
and exists setting('sidebar_defaults')->{$key};
my $defaults = dclone (setting('sidebar_defaults')->{$key} or return);
push @{ vars->{'guards'} },
guard { setting('sidebar_defaults')->{$key} = $defaults };
# new searches will use these defaults in their sidebars
my %params = %{ setting('sidebar_defaults')->{$key} };
foreach my $p (keys %params) {
params->{$p} = $params{$p}->{'default'} if $params{$p}->{'default'};
}
setting('sidebar_defaults')->{$key}->{$_}->{'default'} = params->{$_}
for keys %{ $defaults };
};
# this hook should be loaded _after_ all plugins
@@ -120,16 +121,13 @@ hook 'before_template' => sub {
$tokens->{$sidebar_key} = uri_for("/$mode/$report");
}
if (exists setting('sidebar_defaults')->{$sidebar_key}) {
if (defined setting('sidebar_defaults')->{$sidebar_key}) {
foreach my $col (keys %{ setting('sidebar_defaults')->{$sidebar_key} }) {
if (var('sidebar_key') eq $sidebar_key) {
$tokens->{$sidebar_key}->query_param($col, params->{$col})
if params->{$col};
}
else {
$tokens->{$sidebar_key}->query_param($col,
setting('sidebar_defaults')->{$sidebar_key}->{$col}->{'default'});
}
$tokens->{$sidebar_key}->query_param($col,
setting('sidebar_defaults')->{$sidebar_key}->{$col}->{'default'});
$tokens->{"${sidebar_key}_defaults"}->{$col}
= setting('sidebar_defaults')->{$sidebar_key}->{$col}->{'default'};
}
}

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

@@ -4,6 +4,9 @@ use Dancer ':syntax';
use Dancer::Plugin::Ajax;
use Dancer::Plugin::DBIC;
use Dancer::Plugin::Auth::Extensible;
use Storable 'dclone';
use Scope::Guard 'guard';
use URL::Encode 'url_params_mixed';
hook 'before' => sub {
@@ -14,6 +17,7 @@ hook 'before' => sub {
map {{ name => $_, %{ setting('sidebar_defaults')->{'device_ports'}->{$_} } }}
grep { $_ =~ m/^c_/ } keys %{ setting('sidebar_defaults')->{'device_ports'} };
# this could be done at app startup?
splice @port_columns, setting('device_port_col_idx_left'), 0,
grep {$_->{position} eq 'left'} @{ setting('_extra_device_port_cols') };
splice @port_columns, setting('device_port_col_idx_mid'), 0,
@@ -21,12 +25,12 @@ hook 'before' => sub {
splice @port_columns, setting('device_port_col_idx_right'), 0,
grep {$_->{position} eq 'right'} @{ setting('_extra_device_port_cols') };
var('port_columns' => \@port_columns);
# need to update sidebar_defaults so code scanning params sees plugin cols
# update sidebar_defaults so code scanning params sees new plugin cols
setting('sidebar_defaults')->{'device_ports'}->{ $_->{name} } = $_
for @port_columns;
var('port_columns' => \@port_columns);
# build view settings for port connected nodes and devices
var('connected_properties' => [
sort { $a->{idx} <=> $b->{idx} }
@@ -34,17 +38,18 @@ hook 'before' => sub {
grep { $_ =~ m/^n_/ } keys %{ setting('sidebar_defaults')->{'device_ports'} }
]);
return unless (request->path eq uri_for('/device')->path
or index(request->path, uri_for('/ajax/content/device')->path) == 0);
# override ports form defaults with cookie settings
if (param('reset')) {
cookie('nd_ports-form' => '', expires => '-1 day');
}
elsif (my $cookie = cookie('nd_ports-form')) {
my $cdata = url_params_mixed($cookie);
my $defaults = eval { dclone setting('sidebar_defaults')->{'device_ports'} };
if ($cdata and (ref {} eq ref $cdata) and $defaults) {
push @{ vars->{'guards'} },
guard { setting('sidebar_defaults')->{'device_ports'} = $defaults };
if ($cdata and (ref {} eq ref $cdata)) {
foreach my $key (keys %{ setting('sidebar_defaults')->{'device_ports'} }) {
next unless defined $cdata->{$key}
and $cdata->{$key} =~ m/^[[:alnum:]_]+$/;
@@ -54,6 +59,10 @@ hook 'before' => sub {
}
}
return unless (request->path eq uri_for('/device')->path
or index(request->path, uri_for('/ajax/content/device')->path) == 0);
# force always setting params manually
params->{'firstsearch'} = 'on';
# TODO set cookie
# if (param('reset') or not param('tab') or param('tab') ne 'ports') {

10
share/views/sidebar/device/ports.tt
View File

@@ -62,7 +62,7 @@
<li>
<label class="checkbox">
<input type="checkbox" id="[% item.name | html_entity %]"
name="[% item.name | html_entity %]"[% ' checked="checked"' IF params.${item.name} %] />
name="[% item.name | html_entity %]"[% ' checked="checked"' IF item.default %] />
[% IF item.name == 'c_admin' %]
<span class="label label-info">[% item.label | html_entity %]</span>
[% ELSE %]
@@ -85,12 +85,12 @@
<em class="muted">Mark as Free if Down for:</em><br/>
<select id="nd_days-select" name="age_num">
[% FOREACH count IN [1..32] %]
<option[% ' selected="selected"' IF params.age_num == count %]>[% count %]</option>
<option[% ' selected="selected"' IF device_ports_defaults.age_num == count %]>[% count %]</option>
[% END %]
</select>
<select id="nd_age-select" name="age_unit">
[% FOREACH unit IN [ 'days', 'weeks', 'months', 'years' ] %]
<option[% ' selected="selected"' IF params.age_unit == unit %]>[% unit %]</option>
<option[% ' selected="selected"' IF device_ports_defaults.age_unit == unit %]>[% unit %]</option>
[% END %]
</select>
</li>
@@ -126,7 +126,7 @@
<em class="muted">MAC address format:</em><br/>
<select id="nd_mac-format" name="mac_format">
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
<option[% ' selected="selected"' IF device_ports_defaults.mac_format == format %]>[% format %]</option>
[% END %]
</select>
</li>
@@ -134,7 +134,7 @@
<li>
<label class="checkbox">
<input type="checkbox" id="[% item.name | html_entity %]"
name="[% item.name | html_entity %]"[% ' checked="checked"' IF params.${item.name} %] />
name="[% item.name | html_entity %]"[% ' checked="checked"' IF item.default %] />
[% item.label | html_entity %]
</label>
</li>