fix problem with dup checking manifesting as Argument isn't numeric errors
authorivan <ivan>
Sat, 13 Nov 2004 05:32:32 +0000 (05:32 +0000)
committerivan <ivan>
Sat, 13 Nov 2004 05:32:32 +0000 (05:32 +0000)
FS/FS/svc_acct.pm

index 58442c9..f5f3978 100644 (file)
@@ -863,12 +863,12 @@ sub _check_duplicate {
 
   my $global_unique = $conf->config('global_unique-username');
 
-  my @dup_user = grep { $svcpart != $_->svcpart }
+  my @dup_user = grep { !$_->svcnum || $_->svcnum != $self->svcnum }
                  qsearch( 'svc_acct', { 'username' => $self->username } );
   return gettext('username_in_use')
     if $global_unique eq 'username' && @dup_user;
 
-  my @dup_userdomain = grep { $svcpart != $_->svcpart }
+  my @dup_userdomain = grep { !$_->svcnum || $_->svcnum != $self->svcnum }
                        qsearch( 'svc_acct', { 'username' => $self->username,
                                               'domsvc'   => $self->domsvc } );
   return gettext('username_in_use')