From 9ed4dd502060737513409503d22c48b7edbf1c95 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 17 Jul 2009 09:36:06 +0000 Subject: [PATCH] Optimize a bit the running job view git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9049 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bweb/lib/Bweb.pm | 11 +++++++---- gui/bweb/technotes-3.0 | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm index 30f1841310..6c31a8ba60 100644 --- a/gui/bweb/lib/Bweb.pm +++ b/gui/bweb/lib/Bweb.pm @@ -4021,13 +4021,14 @@ sub display_running_job my $query = " SELECT Client.Name AS name, Job.Name AS jobname, - Job.Level AS level, Type AS type + Job.Level AS level, Type AS type, JobStatus AS jobstatus FROM Job INNER JOIN Client USING (ClientId) $filter WHERE Job.JobId = $arg->{jobid} "; my $row = $self->dbh_selectrow_hashref($query); - + my $status = $row->{jobstatus}; + if ($row) { $arg->{client} = $row->{name}; } else { @@ -4052,8 +4053,10 @@ SELECT corr_jobbytes, jobbytes, corr_jobfiles, jobfiles $row->{jobbytes} = $row->{jobfiles} = 0; } } - my $cli = new Bweb::Client(name => $arg->{client}); - $cli->display_running_job($self, $arg->{jobid}, $row); + if ($status =~ /[RBSmMsjlL]/) { + my $cli = new Bweb::Client(name => $arg->{client}); + $cli->display_running_job($self, $arg->{jobid}, $row); + } if ($arg->{jobid}) { $self->get_job_log(); } diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0 index fa9fa94f22..339870c129 100644 --- a/gui/bweb/technotes-3.0 +++ b/gui/bweb/technotes-3.0 @@ -1,4 +1,5 @@ 17Jul09 +ebl Optimize a bit the running job view ebl Fix bresto relocation box 06Jul09 ebl Display command output by default -- 2.39.5