Merge branch 'master' into og-newnetmap

Changes

@@ -1,3 +1,9 @@
+2.037003 - 2017-12-18
+
+  [BUG FIXES]
+
+  * Fix Connected Device ID in Device Ports sidebar
+
 2.037002 - 2017-12-17
 
   [ENHANCEMENTS]

META.json

@@ -105,7 +105,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.037002"
+         "version" : "2.037003"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -757,6 +757,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.037002",
+   "version" : "2.037003",
    "x_serialization_backend" : "JSON::PP version 2.94"
 }

META.yml

@@ -18,7 +18,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.037002'
+    version: '2.037003'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -520,5 +520,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/BSD-3-Clause
   repository: https://github.com/netdisco/netdisco
-version: '2.037002'
+version: '2.037003'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lib/App/Netdisco.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.037002';
+our $VERSION = '2.037003';
 use App::Netdisco::Configuration;
 
 =head1 NAME

share/views/sidebar/device/ports.tt

@@ -108,7 +108,7 @@
                   <li>
                     <label class="checkbox">
                       <input type="checkbox" id="neigh_id"
-                        name="neigh_id"[% ' checked="checked"' IF params.neigh_id %] />
+                        name="neigh_id"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.neigh_id %] />
                       Connected Device ID
                     </label>
                   </li>