From 8f42b751aebda2e7dce2c363bed6f1e15b411b1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 01:03:10 +0000
Subject: use Net::SSH::ssh_cmd for all job queueing rather than local
 duplicated ssh subs

queue daemon updates: retry & remove links work, bubble up error message
to webinterface, link to svcnum & have job listings on view/svc_* pages,
closes: Bug#280

s/option/optionname/ schema change, dumb mysql, closes: Bug#334
---
 httemplate/browse/queue.cgi | 44 ++------------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 7fce1f5df..b53c1402d 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,47 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header("Job Queue", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Job</TH>
-        <TH>Args</TH>
-        <TH>Date</TH>
-        <TH>Status</TH>
-      </TR>
-END
-
-foreach my $queue ( sort { 
-  $a->getfield('jobnum') <=> $b->getfield('jobnum')
-} qsearch('queue',{}) ) {
-  my($hashref)=$queue->hashref;
-  my $jobnum = $hashref->{jobnum};
-  my $args = join(' ', $queue->args);
-  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-  my $status = $hashref->{status};
-  if ( $status eq 'failed' || $status eq 'locked' ) {
-    $status .=
-      qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )!;
-  }
-  print <<END;
-      <TR>
-        <TD>$jobnum</TD>
-        <TD>$hashref->{job}</TD>
-        <TD>$args</TD>
-        <TD>$date</TD>
-        <TD>$status</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+print header("Job Queue", menubar( 'Main Menu' => $p, )).
+      joblisting({}). '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1