diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2020-08-11 11:13:02 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2020-08-11 11:13:02 -0700 |
| commit | 7515a13175960a22d7a27e2bcb0119cd1427202f (patch) | |
| tree | aac1f1721a713d53cb97071d0b17d7841722be7e | |
| parent | 80a11e51231d20ae1007df1b09a29c98df74fcdf (diff) | |
svc_hardware: better error messages for bad hw_addr when not validating as a MAC address, improve label display, RT#84773
| -rw-r--r-- | FS/FS/svc_hardware.pm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm index cbf3ddfa9..58ab3cc76 100644 --- a/FS/FS/svc_hardware.pm +++ b/FS/FS/svc_hardware.pm @@ -139,18 +139,18 @@ sub label { my @label = (); if (my $type = $self->hardware_type) { my $typenum_label = $part_svc->part_svc_column('typenum'); - push @label, ( $typenum_label && $typenum_label->columnlabel || 'Type:' ). - $type->description; + push @label, ( $typenum_label && $typenum_label->columnlabel || 'Type' ). + ':'. $type->description; } if (my $ser = $self->serial) { my $serial_label = $part_svc->part_svc_column('serial'); - push @label, ( $serial_label && $serial_label->columnlabel || 'Serial#' ). - $ser; + push @label, ( $serial_label && $serial_label->columnlabel || 'Serial' ). + '#'. $ser; } if (my $mac = $self->display_hw_addr) { my $hw_addr_label = $part_svc->part_svc_column('hw_addr'); - push @label, ( $hw_addr_label && $hw_addr_label->columnlabel || 'MAC:'). - $mac; + push @label, ( $hw_addr_label && $hw_addr_label->columnlabel || 'MAC'). + ':'. $mac; } return join(', ', @label); } @@ -192,6 +192,10 @@ sub check { $hw_addr = uc($hw_addr); $hw_addr =~ /^[0-9A-F]{12}$/ or return "Illegal (MAC address) '".$self->getfield('hw_addr')."'"; + } else { + return "Illegal (hardware address) '".$self->getfield('hw_addr')."': ". + "12 alphanumeric characters maximum" + if length($hw_addr) > 12; } $self->setfield('hw_addr', $hw_addr); |