more bug fixes

Netdisco/META.yml

@@ -60,4 +60,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.007000_004
+version: 2.007000_005

Netdisco/lib/App/Netdisco.pm

@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.007000_004';
+our $VERSION = '2.007000_005';
 
 BEGIN {
   if (not length ($ENV{DANCER_APPDIR} || '')

Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm

@@ -101,7 +101,7 @@ sub set_power {
 
   my $ip = $job->device;
   my $pn = $job->port;
-  (my $data = $job->subaction) =~ s/-\w+//;
+  (my $data = $job->subaction) =~ s/-\w+//; # remove -other
 
   # snmp connect using rw community
   my $info = snmp_connect_rw($ip)

Netdisco/lib/App/Netdisco/Manual/Configuration.pod

@@ -286,7 +286,6 @@ Value: List of Strings. Default:
    - 'Virtual-Template\d+'
    - 'Virtual-Access\d+'
    - '(E|T)\d \d\/\d\/\d'
-   - 'Vlan1'
 
 If present, device ports whose names match fully any of the items in this list
 will be ignored by the discovery process.

Netdisco/lib/App/Netdisco/Web/PortControl.pm

@@ -8,7 +8,7 @@ ajax '/ajax/portcontrol' => sub {
     send_error('Forbidden', 403)
       unless var('user')->port_control;
     send_error('No device/port/field', 400)
-      unless param('device') and param('port') and param('field');
+      unless param('device') and (param('port') or param('field'));
 
     my $log = sprintf 'd:[%s] p:[%s] f:[%s]. a:[%s] v[%s]',
       param('device'), (param('port') || ''), param('field'),

Netdisco/share/config.yml

@@ -73,7 +73,6 @@ ignore_interfaces:
   - 'Virtual-Template\d+'
   - 'Virtual-Access\d+'
   - '(E|T)\d \d\/\d\/\d'
-  - 'Vlan1'
 ignore_private_nets: false
 reverse_sysname: false
 vlanctl: true

Netdisco/share/views/ajax/device/ports.tt

@@ -213,10 +213,10 @@
           <span class="label label-important">N</span>
           <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
             [% row.remote_ip | html_entity %] (port: [% row.remote_port | html_entity %]
-            [% ' id: '_ row.remote_type IF row.remote_type%]
-            [% ' type: '_ row.remote_id IF row.remote_id%])</a>
+            [% ' id: '_ row.remote_id IF row.remote_id %]
+            [% ' type: '_ row.remote_type IF row.remote_type %])</a>
           [% ELSE %]
-          <span class="label label-important">N</span> (probable neighbor)
+          <span class="label label-important">N</span> (possible uplink)
           [% END %]
         [% END %]
         [% IF params.c_nodes %]