From 367bd6f858ba7158909dc721eacdc9ca62f55f98 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 9 Feb 2013 15:27:25 +0000 Subject: [PATCH] more appropriate usage of vars and template tokens in before and before_template --- Netdisco/lib/App/Netdisco/Web/Device.pm | 130 +++++++++--------- Netdisco/lib/App/Netdisco/Web/Search.pm | 101 +++++++------- Netdisco/share/views/ajax/device/addresses.tt | 4 +- Netdisco/share/views/ajax/device/details.tt | 8 +- Netdisco/share/views/ajax/device/ports.tt | 12 +- .../share/views/ajax/search/node_by_ip.tt | 8 +- .../share/views/ajax/search/node_by_mac.tt | 12 +- Netdisco/share/views/ajax/search/port.tt | 2 +- Netdisco/share/views/ajax/search/vlan.tt | 12 +- Netdisco/share/views/inventory.tt | 6 +- Netdisco/share/views/sidebar/search/device.tt | 18 +-- 11 files changed, 162 insertions(+), 151 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm index 927186c1..37b272c5 100644 --- a/Netdisco/lib/App/Netdisco/Web/Device.pm +++ b/Netdisco/lib/App/Netdisco/Web/Device.pm @@ -8,77 +8,83 @@ use NetAddr::IP::Lite ':lower'; use App::Netdisco::Util::Web (); # for sort_port hook 'before' => sub { - # list of port detail columns - var('port_columns' => [ - { name => 'c_admin', label => 'Admin Controls', default => '' }, - { name => 'c_port', label => 'Port', default => 'on' }, - { name => 'c_descr', label => 'Description', default => '' }, - { name => 'c_type', label => 'Type', default => '' }, - { name => 'c_duplex', label => 'Duplex', default => '' }, - { name => 'c_lastchange', label => 'Last Change', default => '' }, - { name => 'c_name', label => 'Name', default => 'on' }, - { name => 'c_speed', label => 'Speed', default => '' }, - { name => 'c_mac', label => 'Port MAC', default => '' }, - { name => 'c_mtu', label => 'MTU', default => '' }, - { name => 'c_vlan', label => 'Native VLAN', default => 'on' }, - { name => 'c_vmember', label => 'Tagged VLANs', default => 'on' }, - { name => 'c_power', label => 'PoE', default => '' }, - { name => 'c_nodes', label => 'Connected Nodes', default => '' }, - { name => 'c_neighbors', label => 'Connected Devices', default => 'on' }, - { name => 'c_stp', label => 'Spanning Tree', default => '' }, - { name => 'c_up', label => 'Status', default => '' }, - ]); + # list of port detail columns + var('port_columns' => [ + { name => 'c_admin', label => 'Admin Controls', default => '' }, + { name => 'c_port', label => 'Port', default => 'on' }, + { name => 'c_descr', label => 'Description', default => '' }, + { name => 'c_type', label => 'Type', default => '' }, + { name => 'c_duplex', label => 'Duplex', default => '' }, + { name => 'c_lastchange', label => 'Last Change', default => '' }, + { name => 'c_name', label => 'Name', default => 'on' }, + { name => 'c_speed', label => 'Speed', default => '' }, + { name => 'c_mac', label => 'Port MAC', default => '' }, + { name => 'c_mtu', label => 'MTU', default => '' }, + { name => 'c_vlan', label => 'Native VLAN', default => 'on' }, + { name => 'c_vmember', label => 'Tagged VLANs', default => 'on' }, + { name => 'c_power', label => 'PoE', default => '' }, + { name => 'c_nodes', label => 'Connected Nodes', default => '' }, + { name => 'c_neighbors', label => 'Connected Devices', default => 'on' }, + { name => 'c_stp', label => 'Spanning Tree', default => '' }, + { name => 'c_up', label => 'Status', default => '' }, + ]); - # view settings for port connected devices - var('connected_properties' => [ - { name => 'n_age', label => 'Age Stamp', default => '' }, - { name => 'n_ip', label => 'IP Address', default => 'on' }, - { name => 'n_archived', label => 'Archived Data', default => '' }, - ]); + # view settings for port connected devices + var('connected_properties' => [ + { name => 'n_age', label => 'Age Stamp', default => '' }, + { name => 'n_ip', label => 'IP Address', default => 'on' }, + { name => 'n_archived', label => 'Archived Data', default => '' }, + ]); - # new searches will use these defaults in their sidebars - var('device_ports' => uri_for('/device', { - tab => 'ports', - age_num => 3, - age_unit => 'months', - })); + return unless (request->path eq uri_for('/device')->path + or index(request->path, uri_for('/ajax/content/device')->path) == 0); - foreach my $col (@{ var('port_columns') }) { - next unless $col->{default} eq 'on'; - var('device_ports')->query_param($col->{name}, 'checked'); - } + foreach my $col (@{ var('port_columns') }) { + next unless $col->{default} eq 'on'; + params->{$col->{name}} = 'checked' + if not param('tab') or param('tab') ne 'ports'; + } - foreach my $col (@{ var('connected_properties') }) { - next unless $col->{default} eq 'on'; - var('device_ports')->query_param($col->{name}, 'checked'); - } + foreach my $col (@{ var('connected_properties') }) { + next unless $col->{default} eq 'on'; + params->{$col->{name}} = 'checked' + if not param('tab') or param('tab') ne 'ports'; + } - if (request->path eq uri_for('/device')->path - or index(request->path, uri_for('/ajax/content/device')->path) == 0) { + if (not param('tab') or param('tab') ne 'ports') { + params->{'age_num'} = 3; + params->{'age_unit'} = 'months'; + } +}; - foreach my $col (@{ var('port_columns') }) { - next unless $col->{default} eq 'on'; - params->{$col->{name}} = 'checked' - if not param('tab') or param('tab') ne 'ports'; - } +hook 'before_template' => sub { + my $tokens = shift; - foreach my $col (@{ var('connected_properties') }) { - next unless $col->{default} eq 'on'; - params->{$col->{name}} = 'checked' - if not param('tab') or param('tab') ne 'ports'; - } + # new searches will use these defaults in their sidebars + $tokens->{device_ports} = uri_for('/device', { + tab => 'ports', + age_num => 3, + age_unit => 'months', + }); - if (not param('tab') or param('tab') ne 'ports') { - params->{'age_num'} = 3; - params->{'age_unit'} = 'months'; - } + foreach my $col (@{ var('port_columns') }) { + next unless $col->{default} eq 'on'; + $tokens->{device_ports}->query_param($col->{name}, 'checked'); + } - # for templates to link to same page with modified query but same options - my $self_uri = uri_for(request->path, scalar params); - $self_uri->query_param_delete('q'); - $self_uri->query_param_delete('f'); - var('self_options' => $self_uri->query_form_hash); - } + foreach my $col (@{ var('connected_properties') }) { + next unless $col->{default} eq 'on'; + $tokens->{device_ports}->query_param($col->{name}, 'checked'); + } + + return unless (request->path eq uri_for('/device')->path + or index(request->path, uri_for('/ajax/content/device')->path) == 0); + + # for templates to link to same page with modified query but same options + my $self_uri = uri_for(request->path, scalar params); + $self_uri->query_param_delete('q'); + $self_uri->query_param_delete('f'); + $tokens->{self_options} = $self_uri->query_form_hash; }; ajax '/ajax/content/device/:thing' => sub { diff --git a/Netdisco/lib/App/Netdisco/Web/Search.pm b/Netdisco/lib/App/Netdisco/Web/Search.pm index fde603eb..2238c333 100644 --- a/Netdisco/lib/App/Netdisco/Web/Search.pm +++ b/Netdisco/lib/App/Netdisco/Web/Search.pm @@ -9,51 +9,58 @@ use Net::MAC (); use List::MoreUtils (); hook 'before' => sub { - # view settings for node options - var('node_options' => [ - { name => 'stamps', label => 'Time Stamps', default => 'on' }, - ]); - # view settings for device options - var('device_options' => [ - { name => 'matchall', label => 'Match All Options', default => 'on' }, - ]); + # view settings for node options + var('node_options' => [ + { name => 'stamps', label => 'Time Stamps', default => 'on' }, + ]); - # new searches will use these defaults in their sidebars - var('search_node' => uri_for('/search', {tab => 'node'})); - var('search_device' => uri_for('/search', {tab => 'device'})); + # view settings for device options + var('device_options' => [ + { name => 'matchall', label => 'Match All Options', default => 'on' }, + ]); - foreach my $col (@{ var('node_options') }) { - next unless $col->{default} eq 'on'; - var('search_node')->query_param($col->{name}, 'checked'); - } + return unless (request->path eq uri_for('/search')->path + or index(request->path, uri_for('/ajax/content/search')->path) == 0); - foreach my $col (@{ var('device_options') }) { - next unless $col->{default} eq 'on'; - var('search_device')->query_param($col->{name}, 'checked'); - } + foreach my $col (@{ var('node_options') }) { + next unless $col->{default} eq 'on'; + params->{$col->{name}} = 'checked' + if not param('tab') or param('tab') ne 'node'; + } - if (request->path eq uri_for('/search')->path - or index(request->path, uri_for('/ajax/content/search')->path) == 0) { + foreach my $col (@{ var('device_options') }) { + next unless $col->{default} eq 'on'; + params->{$col->{name}} = 'checked' + if not param('tab') or param('tab') ne 'device'; + } +}; - foreach my $col (@{ var('node_options') }) { - next unless $col->{default} eq 'on'; - params->{$col->{name}} = 'checked' - if not param('tab') or param('tab') ne 'node'; - } +hook 'before_template' => sub { + my $tokens = shift; - foreach my $col (@{ var('device_options') }) { - next unless $col->{default} eq 'on'; - params->{$col->{name}} = 'checked' - if not param('tab') or param('tab') ne 'device'; - } + # new searches will use these defaults in their sidebars + $tokens->{search_node} = uri_for('/search', {tab => 'node'}); + $tokens->{search_device} = uri_for('/search', {tab => 'device'}); - # used in the device search sidebar template to set selected items - foreach my $opt (qw/model vendor os_ver/) { - my $p = (ref [] eq ref param($opt) ? param($opt) - : (param($opt) ? [param($opt)] : [])); - var("${opt}_lkp" => { map { $_ => 1 } @$p }); - } - } + foreach my $col (@{ var('node_options') }) { + next unless $col->{default} eq 'on'; + $tokens->{search_node}->query_param($col->{name}, 'checked'); + } + + foreach my $col (@{ var('device_options') }) { + next unless $col->{default} eq 'on'; + $tokens->{search_device}->query_param($col->{name}, 'checked'); + } + + return unless (request->path eq uri_for('/search')->path + or index(request->path, uri_for('/ajax/content/search')->path) == 0); + + # used in the device search sidebar template to set selected items + foreach my $opt (qw/model vendor os_ver/) { + my $p = (ref [] eq ref param($opt) ? param($opt) + : (param($opt) ? [param($opt)] : [])); + $tokens->{"${opt}_lkp"} = { map { $_ => 1 } @$p }; + } }; # device with various properties or a default match-all @@ -226,15 +233,9 @@ get '/search' => sub { } # used in the device search sidebar to populate select inputs - var('model_list' => [ - schema('netdisco')->resultset('Device')->get_distinct_col('model') - ]); - var('os_ver_list' => [ - schema('netdisco')->resultset('Device')->get_distinct_col('os_ver') - ]); - var('vendor_list' => [ - schema('netdisco')->resultset('Device')->get_distinct_col('vendor') - ]); + my $model_list = [ schema('netdisco')->resultset('Device')->get_distinct_col('model') ]; + my $os_ver_list = [ schema('netdisco')->resultset('Device')->get_distinct_col('os_ver') ]; + my $vendor_list = [ schema('netdisco')->resultset('Device')->get_distinct_col('vendor') ]; # list of tabs var('tabs' => [ @@ -244,7 +245,11 @@ get '/search' => sub { { id => 'port', label => 'Port' }, ]); - template 'search'; + template 'search', { + model_list => $model_list, + os_ver_list => $os_ver_list, + vendor_list => $vendor_list, + }; }; true; diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt index a195b03f..984f340e 100644 --- a/Netdisco/share/views/ajax/device/addresses.tt +++ b/Netdisco/share/views/ajax/device/addresses.tt @@ -14,10 +14,10 @@ [% row.alias %] [% row.dns.remove(settings.domain_suffix) %] [% row.port %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.port %]">[% row.port %] [% row.device_port.name %] [% row.subnet %] + href="[% search_device %]&ip=[% row.subnet %]">[% row.subnet %] [% END %] diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt index 5fa54ab8..11d49860 100644 --- a/Netdisco/share/views/ajax/device/details.tt +++ b/Netdisco/share/views/ajax/device/details.tt @@ -18,7 +18,7 @@ [% ELSE %] [% d.location %] + href="[% search_device %]&location=[% d.location | uri %]">[% d.location %] [% END %] @@ -41,10 +41,10 @@ Vendor / Model [% d.vendor %] + href="[% search_device %]&vendor=[% d.vendor | uri %]">[% d.vendor %] / [% d.model %] + href="[% search_device %]&model=[% d.model | uri %]">[% d.model %] @@ -52,7 +52,7 @@ [% d.os %] / [% d.os_ver %] + href="[% search_device %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver %] diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt index b26a19a6..d89d9238 100644 --- a/Netdisco/share/views/ajax/device/ports.tt +++ b/Netdisco/share/views/ajax/device/ports.tt @@ -44,7 +44,7 @@ [% END %] + self_options) %]&q=[% params.q | uri %]&f=[% row.port | uri %]"> [% row.port | html_entity %] [% END %] @@ -182,12 +182,12 @@ [% IF params.c_neighbors AND row.remote_ip %] [% IF row.neighbor %] + self_options) %]&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]"> [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip %] ([% row.remote_port | html_entity %]) [% ELSE %] N - + [% row.remote_ip %] (port: [% row.remote_port %] id: [% (row.remote_type _ ' / ') IF row.remote_type %][% row.remote_id %]) [% END %] @@ -196,16 +196,16 @@ [% FOREACH node IN row.$nodes %] [% '
' IF row.remote_ip OR NOT loop.first %] [% 'A  ' IF NOT node.active %] - [% node.mac %] + [% node.mac %] [% ' (' _ node.time_last_age _ ')' IF params.n_age %] [% IF params.n_ip %] [% FOREACH ip IN node.ips %]
  [% 'A  ' IF NOT ip.active %] [% SET dns = ip.dns %] [% IF dns %] - [% dns %] ([% ip.ip %]) + [% dns %] ([% ip.ip %]) [% ELSE %] - [% ip.ip %] + [% ip.ip %] [% END %] [% END %] [% END %] diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt index 2b1ded49..d8adb1e4 100644 --- a/Netdisco/share/views/ajax/search/node_by_ip.tt +++ b/Netdisco/share/views/ajax/search/node_by_ip.tt @@ -17,12 +17,12 @@ [% WHILE (row = macs.next) %] [% row.mac %] + href="[% search_node %]&q=[% row.mac | uri %]">[% row.mac %] [% IF params.vendor %] [% row.oui.company %] [% END %] IP → MAC - [% row.ip %] + [% row.ip %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] [% ' A' IF NOT row.active %] @@ -38,7 +38,7 @@   [% END %] Switch Port - [% node.switch %] [ [% node.port %] ] + [% node.switch %] [ [% node.port %] ] [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %] [% ' A' IF NOT node.active %] @@ -55,7 +55,7 @@   [% END %] MAC → IP - [% nodeip.ip %] + [% nodeip.ip %] [% ' (' _ nodeip.dns.remove(settings.domain_suffix) _ ')' IF nodeip.dns %] [% ' A' IF NOT nodeip.active %] diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt index aabd5cb4..80c5dd0b 100644 --- a/Netdisco/share/views/ajax/search/node_by_mac.tt +++ b/Netdisco/share/views/ajax/search/node_by_mac.tt @@ -20,7 +20,7 @@ [% IF first_row %] [% row.mac %] + href="[% search_node %]&q=[% row.mac | uri %]">[% row.mac %] [% ELSE %]   [% END %] @@ -35,7 +35,7 @@ [% END %] MAC → IP - [% row.ip %] + [% row.ip %] [% ' (' _ row.dns.remove(settings.domain_suffix) _ ')' IF row.dns %] [% ' A' IF NOT row.active %] @@ -51,7 +51,7 @@ [% IF first_row %] [% node.mac %] + href="[% search_node %]&q=[% node.mac | uri %]">[% node.mac %] [% ELSE %]   [% END %] @@ -66,7 +66,7 @@ [% END %] Switch Port - [% node.switch %] [ [% node.port %] ] + [% node.switch %] [ [% node.port %] ] [% ' (' _ node.device.dns.remove(settings.domain_suffix) _ ')' IF node.device.dns %] [% ' A' IF NOT node.active %] @@ -82,7 +82,7 @@ [% IF first_row %] [% port.mac %] + href="[% search_node %]&q=[% port.mac | uri %]">[% port.mac %] [% ELSE %]   [% END %] @@ -97,7 +97,7 @@ [% END %] Switch Port - [% port.ip %] [ [% port.port %] ] + [% port.ip %] [ [% port.port %] ] [% ' (' _ port.device.dns.remove(settings.domain_suffix) _ ')' IF port.device.dns %] [% IF params.stamps %] diff --git a/Netdisco/share/views/ajax/search/port.tt b/Netdisco/share/views/ajax/search/port.tt index 8642c401..23bf02d0 100644 --- a/Netdisco/share/views/ajax/search/port.tt +++ b/Netdisco/share/views/ajax/search/port.tt @@ -11,7 +11,7 @@ [% WHILE (row = results.next) %] [% row.name %] - [% row.ip %] [ [% row.port %] ] + [% row.ip %] [ [% row.port %] ] [% ' (' _ row.device.dns.remove(settings.domain_suffix) _ ')' IF row.device.dns %] [% row.descr %] diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt index 511aa0b3..cd2f3f6b 100644 --- a/Netdisco/share/views/ajax/search/vlan.tt +++ b/Netdisco/share/views/ajax/search/vlan.tt @@ -13,17 +13,17 @@ [% WHILE (row = results.next) %] [% row.vlan.vlan %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.vlan %] [% row.dns.remove(settings.domain_suffix) || row.ip %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.dns.remove(settings.domain_suffix) || row.ip %] [% row.vlan.description %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.description %] [% row.model %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.model %] [% row.os %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.os %] [% row.vendor %] + href="[% device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vendor %] [% END %] diff --git a/Netdisco/share/views/inventory.tt b/Netdisco/share/views/inventory.tt index 895d7ce2..8f3fc9c4 100644 --- a/Netdisco/share/views/inventory.tt +++ b/Netdisco/share/views/inventory.tt @@ -17,12 +17,12 @@ + href="[% search_device %]&vendor=[% platform.vendor %]"> [% platform.vendor %] + href="[% search_device %]&model=[% platform.model %]"> [% platform.model %] [% platform.get_column('count') %] @@ -48,7 +48,7 @@ [% release.os %] + href="[% search_device %]&os_ver=[% release.os_ver %]"> [% release.os_ver %] [% release.get_column('count') %] diff --git a/Netdisco/share/views/sidebar/search/device.tt b/Netdisco/share/views/sidebar/search/device.tt index 1fe18f8a..da12d85b 100644 --- a/Netdisco/share/views/sidebar/search/device.tt +++ b/Netdisco/share/views/sidebar/search/device.tt @@ -42,29 +42,29 @@ rel="tooltip" data-placement="left" data-offset="5" data-title="Description"/>
-
-
-