135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix truncated port description change (F. Schiavarelli)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-07-13 18:08:56 +01:00
parent 3457d083f4
commit 13de616e35
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -8,6 +8,7 @@
* [ND1#117] unknown devices missing from inventory * [ND1#117] unknown devices missing from inventory
* [#118] Fix table rendering on port search tab when VLAN is null * [#118] Fix table rendering on port search tab when VLAN is null
* Fix truncated port description change (F. Schiavarelli)
2.028000 - 2014-07-01 2.028000 - 2014-07-01

6
Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
View File

@@ -23,6 +23,10 @@ sub set_portcontrol {
return job_error("Cannot alter port: $reconfig_check") return job_error("Cannot alter port: $reconfig_check")
if $reconfig_check; if $reconfig_check;
# need to remove "-other" which appears for power/portcontrol
(my $sa = $job->subaction) =~ s/-\w+//;
$job->subaction($sa);
return _set_port_generic($job, 'up_admin'); return _set_port_generic($job, 'up_admin');
} }
@@ -50,7 +54,7 @@ sub _set_port_generic {
my $ip = $job->device; my $ip = $job->device;
my $pn = $job->port; my $pn = $job->port;
(my $data = $job->subaction) =~ s/-\w+//; my $data = $job->subaction;
my $port = get_port($ip, $pn) my $port = get_port($ip, $pn)
or return job_error("Unknown port name [$pn] on device [$ip]"); or return job_error("Unknown port name [$pn] on device [$ip]");