X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fqueue.pm;h=4b880a23c2dfa8cdf40dc349fb3b170c074ead4d;hb=44e3eff0aa6e7bdb7f4ecd9ee1ddf141e1b68af3;hp=e5369cf820295ca974619c3b218574e9efccfb38;hpb=7dc23049c25d316da196647a8be1d74dfc09a02a;p=freeside.git diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm index e5369cf82..4b880a23c 100644 --- a/FS/FS/queue.pm +++ b/FS/FS/queue.pm @@ -251,17 +251,26 @@ END $html .= 'Account' unless $hashref->{svcnum}; $html .= ''; + my $dangerous = $conf->exists('queue_dangerous_controls'); + my $p = FS::CGI::popurl(2); foreach my $queue ( sort { $a->getfield('jobnum') <=> $b->getfield('jobnum') } @queue ) { my $queue_hashref = $queue->hashref; my $jobnum = $queue->jobnum; - my $args = join(' ', $queue->args); + + my $args; + if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) { + $args = join(' ', $queue->args); + } else { + $args = ''; + } + my $date = time2str( "%a %b %e %T %Y", $queue->_date ); my $status = $queue->status; $status .= ': '. $queue->statustext if $queue->statustext; - if ( $conf->exists('queue_dangerous_controls') + if ( $dangerous || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) ) { $status .= qq! ( retry |!. @@ -305,7 +314,7 @@ END =head1 VERSION -$Id: queue.pm,v 1.9 2002-03-24 14:29:00 ivan Exp $ +$Id: queue.pm,v 1.10 2002-03-27 07:08:08 ivan Exp $ =head1 BUGS