ebl Fix group statistics to use client_group param

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6784 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index a6a14f6c624b408e173f2148a206748fadd490f8..38e1b1eff17ee8cc6cc08f0cc4f6257b5bbcae79 100755 (executable)
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -382,7 +382,7 @@ if ($action eq 'begin') {           # main display
     $bweb->can_do('r_view_stat');
     print "<div><table border='0'><tr><td valign='top'>\n";
     my $fields = $bweb->get_form(qw/since age 
-                                    db_client_groups qclient_groups/); # drop this to hide 
+                                    db_client_groups qclient_groups/); 
     $fields->{action}='group_stats';
     $fields->{hide_level}=1;
     $fields->{hide_type}=1;

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 647101ae28f31d57694217e3cac3f67f13adc772..5176e99f3ee7a5dc67500160d54084509a4bbf45 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -4041,6 +4041,7 @@ sub display_group_stats
     my $filter = $self->get_client_group_filter();
 
     my ($limit, $label) = $self->get_limit(%$arg);
+    my ($where, undef) = $self->get_param('client_groups', 'level');
 
     my $query = "
 SELECT client_group_name AS name, nb_byte, nb_file, nb_job, nb_resto
@@ -4052,7 +4053,7 @@ SELECT client_group_name AS name, nb_byte, nb_file, nb_job, nb_resto
       FROM job_old JOIN client_group_member USING (ClientId) 
       JOIN client_group USING (client_group_id) $filter
      WHERE JobStatus = 'T' AND Type IN ('M', 'B', 'g') 
-           $limit
+           $where $limit
     GROUP BY client_group_name ORDER BY client_group_name
 
   ) AS T1 LEFT JOIN (
@@ -4061,7 +4062,7 @@ SELECT client_group_name AS name, nb_byte, nb_file, nb_job, nb_resto
       FROM job_old JOIN client_group_member USING (ClientId) 
       JOIN client_group USING (client_group_id)
      WHERE JobStatus = 'T' AND Type = 'R'
-           $limit
+           $where $limit
     GROUP BY client_group_name ORDER BY client_group_name
 
   ) AS T2 USING (client_group_name)

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 3a36ef4e4133246460a29476d15449c90dcc4f1b..a343f6676b9eef1de99e067b0330f04ed9cc31ae 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,6 @@
+10Apr08
+ebl  Fix group statistics to use client_group param
+
 03Apr08
 ebl  Tweak progress bar and add Backuped files count to job status
 ebl  Remove progress bar from restore