diff --git a/Changes b/Changes index 6e1cf030..7e25be75 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,10 @@ * #401 Autodiscovery via EIGRP peers + [BUG FIXES] + + * #394 (redux) enabled "Management IPs" hides after "Redraw Map" + 2.039022 - 2018-04-18 [BUG FIXES] diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm index f46c5ff1..2d4f216f 100644 --- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm +++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm @@ -224,7 +224,7 @@ ajax '/ajax/data/device/netmap' => require_login sub { ID => $device->ip, SIZEVALUE => (param('dynamicsize') ? $color_lkp{speed} : 3000), ((exists $color_lkp{$colorby}) ? (COLORVALUE => $color_lkp{$colorby}) : ()), - LABEL => $name, + LABEL => (param('showips') ? ($device->ip .' '. $name) : $name), ORIG_LABEL => $name, INFOSTRING => make_node_infostring($device), LINK => uri_for('/device', { diff --git a/share/views/ajax/device/netmap.tt b/share/views/ajax/device/netmap.tt index 1551acb5..233ce9f6 100644 --- a/share/views/ajax/device/netmap.tt +++ b/share/views/ajax/device/netmap.tt @@ -157,9 +157,6 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]?[% my_query %]', function(m graph.start(mapdata); - // trigger update of router labels (to reflect sidebar setting) - $('#nd_showips').trigger('change'); - // about a second after render starts, zoom in a bit if ('[% params.mapshow %]' == 'neighbors') { setTimeout(function() {