From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 26 Sep 2010 21:38:45 +0000 (+0200)
Subject: bweb: don't display general job errors when using client filter
X-Git-Tag: Release-5.2.1~1077
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c66c04088998b6ff011613e0439be51c5219dad6;p=bacula%2Fbacula

bweb: don't display general job errors when using client filter
---

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 97a29f2da3..15e2d06229 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2235,7 +2235,8 @@ sub display_general
     my ($self, %arg) = @_ ;
 
     my ($limit, $label) = $self->get_limit(%arg);
-
+    my $filter = $self->get_client_filter();
+    $filter = $filter? " JOIN Client USING (ClientId) $filter " : '';
     my $query = "
 SELECT
     (SELECT count(Pool.PoolId)   FROM Pool)   AS nb_pool,
@@ -2244,7 +2245,7 @@ SELECT
     (SELECT sum(VolBytes)        FROM Media)  AS nb_bytes,
     ($self->{sql}->{DB_SIZE})                 AS db_size,
     (SELECT count(Job.JobId)
-      FROM Job
+      FROM Job $filter
       WHERE Job.JobStatus IN ('E','e','f','A')
       $limit
     )                                         AS nb_err,