show ips functionality; improvement to maximise icon; bugfix d3-force label wrap

2017-12-26 10:52:47 +00:00
parent 71a1a20909
commit 10ccaa78b1
5 changed files with 44 additions and 11 deletions
--- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
@@ -158,7 +158,9 @@ ajax '/ajax/data/device/netmap' => require_login sub {
          (($device->get_column('log') || 1) * 1000) : 3000),
        (param('colorgroups') ?
          (COLORVALUE => ($first_hgrp ? setting('host_group_displaynames')->{$first_hgrp} : 'Other')) : ()),
-        LABEL => $name,
+        LABEL => (param('showips')
+          ? (($name eq $device->ip) ? $name : ($name .' '. $device->ip)) : $name),
+        ORIG_LABEL => $name,
      };

      if ($mapshow ne 'neighbors' and exists $pos_for->{$device->ip}) {