Optimize "Customer has a referring customer" condition, RT#74452

[freeside.git] / httemplate / search / queue.html

diff --git a/httemplate/search/queue.html b/httemplate/search/queue.html
index 125a6f7..22032b1 100644 (file)
--- a/httemplate/search/queue.html
+++ b/httemplate/search/queue.html
@@ -1,10 +1,10 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                  'title'       => 'Job Queue',
                  'name'        => 'jobs',
                 'html_form'   => qq!<FORM NAME="jobForm" ACTION="$p/misc/queue.cgi" METHOD="POST">!,
                  'query'       => { 'table'     => 'queue',
                                     'hashref'   => $hashref,
-                                    'extra_sql' => 'ORDER BY jobnum',
+                                    'order_by' => 'ORDER BY jobnum',
                                   },
                  'count_query' => $count_query,
                  'header' => [ '#',
@@ -13,6 +13,7 @@
                                'Date',
                                'Status',
                                'Account', # unless $hashref->{'svcnum'}
+                               'Employee',
                                '', # checkbox column
                              ],
                  'fields' => [
@@ -50,10 +51,14 @@
                                                  || ( ! $noactions
                                                       && $status =~ /^failed/
                                                       || $status =~ /^locked/
+                                                      || $status =~ /^done/
                                                     );
                                  if ( $changable ) {
+                                   $status .= qq! (!;
+                                   $status .=
+                                     qq! &nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!
+                                     unless $status =~ /^done/;
                                    $status .=
-                                     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;)!;
                                  }
                                  $status;
@@ -74,6 +79,11 @@
                                },
                                sub {
                                  my $queue = shift;
+                                 my $access_user = $queue->access_user;
+                                 return $access_user ? $access_user->username : '';
+                               },
+                               sub {
+                                 my $queue = shift;
                                  my $jobnum = $queue->jobnum;
                                  my $status = $queue->status;
                                  my $changable = $dangerous
@@ -116,9 +126,8 @@
                                     '';
                                   }
                                 },
-             )
-
-%>
+             
+&>
 <%init>
 
 die "access denied"