handle errors better

[freeside.git] / FS / FS / queue.pm

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 83ae171..3260de2 100644 (file)
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -185,10 +185,12 @@ sub check {
     || $self->ut_enum('status',['', qw( new locked failed )])
     || $self->ut_textn('statustext')
     || $self->ut_numbern('svcnum')
-    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum')
   ;
   return $error if $error;
 
+  $error = $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum');
+  $self->svcnum('') if $error;
+
   $self->status('new') unless $self->status;
   $self->_date(time) unless $self->_date;
 
@@ -251,8 +253,8 @@ END
     $status .= ': '. $queue->statustext if $queue->statustext;
     if ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) {
       $status .=
-        qq! ( <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-        qq! <A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove </A> )!;
+        qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
+        qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
     }
     my $cust_svc = $queue->cust_svc;
     my $account;
@@ -287,7 +289,7 @@ END
 
 =head1 VERSION
 
-$Id: queue.pm,v 1.4 2002-02-20 01:03:09 ivan Exp $
+$Id: queue.pm,v 1.6 2002-02-22 06:42:28 ivan Exp $
 
 =head1 BUGS