From 99670c0a0b72b05d09f948027b50cd8e9850ad37 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 20 Mar 2016 19:11:39 -0700 Subject: [PATCH] allow null serial and mac, RT#31388 --- FS/FS/svc_cable.pm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm index 122d8c6af..01c5de760 100644 --- a/FS/FS/svc_cable.pm +++ b/FS/FS/svc_cable.pm @@ -160,8 +160,8 @@ sub check { || $self->ut_foreign_keyn('providernum', 'cable_provider', 'providernum') || $self->ut_alphan('ordernum') || $self->ut_foreign_key('modelnum', 'cable_model', 'modelnum') - || $self->ut_alpha('serialnum') - || $self->ut_mac_addr('mac_addr') + || $self->ut_alphan('serialnum') + || $self->ut_mac_addrn('mac_addr') ; return $error if $error; @@ -174,16 +174,20 @@ sub _check_duplicate { # Not reliable checks because the table isn't locked, but that's why we have # unique indices. These are just to give friendlier error messages. - my @dup_mac; - @dup_mac = $self->find_duplicates('global', 'mac_addr'); - if ( @dup_mac ) { - return "MAC address in use (svcnum ".$dup_mac[0]->svcnum.")"; + if ( $self->mac_addr ) { + my @dup_mac; + @dup_mac = $self->find_duplicates('global', 'mac_addr'); + if ( @dup_mac ) { + return "MAC address in use (svcnum ".$dup_mac[0]->svcnum.")"; + } } - my @dup_serial; - @dup_serial = $self->find_duplicates('global', 'serialnum'); - if ( @dup_serial ) { - return "Serial number in use (svcnum ".$dup_serial[0]->svcnum.")"; + if ( $self->serialnum ) { + my @dup_serial; + @dup_serial = $self->find_duplicates('global', 'serialnum'); + if ( @dup_serial ) { + return "Serial number in use (svcnum ".$dup_serial[0]->svcnum.")"; + } } ''; -- 2.11.0