ebl fix display_job_group, it works now !

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

diff --git a/gui/bweb/lang/es/tpl/display_job_group.tpl b/gui/bweb/lang/es/tpl/display_job_group.tpl
index 14037ec0d2729c5de144a8766cfcb2270be54cec..cb39e97285b9a18cb27ea6a75ab83bdf2f8761af 100644 (file)
--- a/gui/bweb/lang/es/tpl/display_job_group.tpl
+++ b/gui/bweb/lang/es/tpl/display_job_group.tpl
@@ -31,7 +31,7 @@ a.href='?action=job;client_group=<TMPL_VAR client_group_name>;age=' + age;
 
 img = document.createElement("IMG");
 
-if ("<TMPL_VAR nbjoberr>") {
+if (<TMPL_VAR nbjoberr>) {
   jobstatus='f';
 
 } else {

diff --git a/gui/bweb/lang/fr/tpl/display_job_group.tpl b/gui/bweb/lang/fr/tpl/display_job_group.tpl
index 8e1b53611ea28daf2678e109cdb19ff3d9ec5887..49671dae3e6fa35e70ee6a61ebebf28e62c9a3fe 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_job_group.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_group.tpl
@@ -31,7 +31,7 @@ a.href='?action=job;client_group=<TMPL_VAR client_group_name>;age=' + age;
 
 img = document.createElement("IMG");
 
-if ("<TMPL_VAR nbjoberr>") {
+if (<TMPL_VAR nbjoberr>) {
   jobstatus='f';
 
 } else {

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index e9c4bdf0826d17c97339b136113f325f0e758d07..c22078a9368907b99ebf1088d56d2b0262c4c7d7 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2081,11 +2081,11 @@ sub display_job_group
     my $query = 
 "
 SELECT client_group_name AS client_group_name,
-       jobok.jobfiles  + joberr.jobfiles  AS jobfiles,
-       jobok.jobbytes  + joberr.jobbytes  AS jobbytes,
-       jobok.joberrors + joberr.joberrors AS joberrors,
-       jobok.nbjobs  AS nbjobok,
-       joberr.nbjobs AS nbjoberr
+       COALESCE(jobok.jobfiles,0)  + COALESCE(joberr.jobfiles,0)  AS jobfiles,
+       COALESCE(jobok.jobbytes,0)  + COALESCE(joberr.jobbytes,0)  AS jobbytes,
+       COALESCE(jobok.joberrors,0) + COALESCE(joberr.joberrors,0) AS joberrors,
+       COALESCE(jobok.nbjobs,0)  AS nbjobok,
+       COALESCE(joberr.nbjobs,0) AS nbjoberr
 
 FROM (
     SELECT client_group_name AS client_group_name, COUNT(1) AS nbjobs, 
@@ -2115,7 +2115,7 @@ FROM (
 
     my $all = $self->dbh_selectall_hashref($query, 'client_group_name');
 
-    my $rep = { groups => [ values %$all ], age => $arg{age} };
+    my $rep = { groups => [ values %$all ], age => $arg{age}, filter => $label };
                 
     $self->debug($rep);
     $self->display($rep, "display_job_group.tpl");

diff --git a/gui/bweb/tpl/display_job_group.tpl b/gui/bweb/tpl/display_job_group.tpl
index 14037ec0d2729c5de144a8766cfcb2270be54cec..cb39e97285b9a18cb27ea6a75ab83bdf2f8761af 100644 (file)
--- a/gui/bweb/tpl/display_job_group.tpl
+++ b/gui/bweb/tpl/display_job_group.tpl
@@ -31,7 +31,7 @@ a.href='?action=job;client_group=<TMPL_VAR client_group_name>;age=' + age;
 
 img = document.createElement("IMG");
 
-if ("<TMPL_VAR nbjoberr>") {
+if (<TMPL_VAR nbjoberr>) {
   jobstatus='f';
 
 } else {

diff --git a/gui/debian/bweb.postinst b/gui/debian/bweb.postinst
index 6ffc9d68ce17d5f15eb523939765efd4fa9e979b..716e64ece92899f34b0df3911877f568b6252f45 100644 (file)
--- a/gui/debian/bweb.postinst
+++ b/gui/debian/bweb.postinst
@@ -13,7 +13,8 @@ if [ "$1" = "configure" ] ; then
 
  chmod 755 /etc/bacula
 
- chown www-data:bacula /etc/bacula/bweb.conf
+ chown www-data:root /etc/bacula/bweb.conf
+ chgrp bacula /etc/bacula/bweb.conf || true
  chmod 640 /etc/bacula/bweb.conf
 
  chown www-data:root /var/spool/bweb