diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-11-17 14:41:19 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-11-17 14:41:19 -0800 |
| commit | a39ad17a0b4f4fa3fdf988804dc2bd313180eccf (patch) | |
| tree | fecbccb669d7be616c66fbb7240588710116d7fb /FS/FS/svc_cable.pm | |
| parent | 37a23f4ca89d7f18274721f1281df9df9e93701c (diff) | |
respect part_svc labels in svc_hardware & svc_cable short service labels, RT#73405
Diffstat (limited to 'FS/FS/svc_cable.pm')
| -rw-r--r-- | FS/FS/svc_cable.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm index 50859da..9e818e1 100644 --- a/FS/FS/svc_cable.pm +++ b/FS/FS/svc_cable.pm @@ -126,9 +126,12 @@ sub label { my @label = (); push @label, 'MAC:'. $self->mac_addr_pretty if $self->mac_addr; - push @label, ($part_svc->part_svc_column('serialnum') || 'Serial#'). - $self->serialnum - if $self->serialnum; + if ( $self->serialnum ) { + my $serialnum_label = $part_svc->part_svc_column('serialnum'); + push @label, + ($serialnum_label && $serialnum_label->columnlabel || 'Serial#'). + $self->serialnum; + } return join(', ', @label); } |