[#86] Use Vendor abbrevs to enhance node display in device port view

This commit is contained in:
Eric A. Miller
2014-01-26 10:02:29 -05:00
parent 65b456d2d3
commit 316e3780b0
4 changed files with 20 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
2.022001 -
[NEW FEATURES]
* [#86] Use Vendor abbrevs to enhance node display in device port view
2.022000 - 2014-01-26 2.022000 - 2014-01-26
[NEW FEATURES] [NEW FEATURES]

View File

@@ -49,6 +49,7 @@ hook 'before' => sub {
{ name => 'n_age', label => 'Age Stamp', default => '' }, { name => 'n_age', label => 'Age Stamp', default => '' },
{ name => 'n_ip', label => 'IP Address', default => 'on' }, { name => 'n_ip', label => 'IP Address', default => 'on' },
{ name => 'n_ssid', label => 'SSID', default => 'on' }, { name => 'n_ssid', label => 'SSID', default => 'on' },
{ name => 'n_vendor', label => 'Vendor', default => '' },
{ name => 'n_archived', label => 'Archived Data', default => '' }, { name => 'n_archived', label => 'Archived Data', default => '' },
]); ]);

View File

@@ -139,7 +139,11 @@ get '/ajax/content/device/ports' => require_login sub {
# retrieve wireless SSIDs, if asked for # retrieve wireless SSIDs, if asked for
$set = $set->search_rs({}, { prefetch => [{$nodes_name => 'wireless'}] }) $set = $set->search_rs({}, { prefetch => [{$nodes_name => 'wireless'}] })
if param('c_nodes'); if param('c_nodes') && param('n_ssid');
# retrieve vendor, if asked for
$set = $set->search_rs({}, { prefetch => [{$nodes_name => 'oui'}] })
if param('c_nodes') && param('n_vendor');
# retrieve neighbor devices, if asked for # retrieve neighbor devices, if asked for
$set = $set->search_rs({}, { prefetch => [{neighbor_alias => 'device'}] }) $set = $set->search_rs({}, { prefetch => [{neighbor_alias => 'device'}] })

View File

@@ -282,6 +282,13 @@
[% END %] [% END %]
) )
[% END %] [% END %]
[% IF params.n_vendor AND node.oui.defined %]
(Vendor:
[% FOREACH oui IN node.oui %]
[%+ oui.abbrev | html_entity %]
[% END %]
)
[% END %]
[% ' (' _ node.time_last_age _ ')' IF params.n_age %] [% ' (' _ node.time_last_age _ ')' IF params.n_age %]
[% IF params.n_ip %] [% IF params.n_ip %]
[% FOREACH ip IN node.ips %] [% FOREACH ip IN node.ips %]