Merge branch 'master' into og-newnetmap

2017-12-18 20:14:20 +00:00
parent 60412cd6e6 7f8e3edfff
commit ba48eee5f7
5 changed files with 12 additions and 6 deletions
--- a/share/views/sidebar/device/ports.tt
+++ b/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>