ebl fix joberrors display

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

diff --git a/gui/bweb/html/bweb.js b/gui/bweb/html/bweb.js
index fdcff51927107359d9f928d3a711d711c2260cb2..774347438f37d6b6cbd954b97d25c8739f452bf4 100644 (file)
--- a/gui/bweb/html/bweb.js
+++ b/gui/bweb/html/bweb.js
@@ -19,6 +19,7 @@
  var odd_cell_color  = "#EEEEEE";
  var header_color    = "#E1E0DA";
  var rows_per_page   = 20;
+ var bweb_root       = "/bweb/";
  var up_icon         = "/bweb/up.gif";
  var down_icon       = "/bweb/down.gif";
  var prev_icon       = "/bweb/left.gif";
@@ -242,6 +243,25 @@ function percent_usage(value, parent)
    return parent;
 }
 
+function bweb_get_job_img(status, errors)
+{
+  var ret;
+
+  if (status == "T") {
+     if (errors > 0) {
+        ret = "W.png";
+
+     } else {
+        ret = "T.png";
+     }
+
+  } else {
+     ret = status + ".png";
+  }
+
+  return bweb_root + ret;
+}
+
 function search_media()
 {
  var what = document.getElementById('searchbox').value;

diff --git a/gui/bweb/lang/fr/tpl/display_job.tpl b/gui/bweb/lang/fr/tpl/display_job.tpl
index 68990d86e4dc6284f222f2c02abf234319c5618e..c179ee9c6411a9433312b51ade0f44d5072cc0fa 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job.tpl
@@ -32,7 +32,7 @@ a = document.createElement('A');
 a.href='?action=job_zoom;jobid=<TMPL_VAR JobId>';
 
 img = document.createElement("IMG");
-img.src="/bweb/<TMPL_VAR JobStatus>.png";
+img.src=bweb_get_job_img("<TMPL_VAR JobStatus>", <TMPL_VAR joberrors>);
 img.title=jobstatus['<TMPL_VAR JobStatus>']; 
 
 a.appendChild(img);

diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
index 6f94248290e1df8356c3bcdc3de9a55913387881..89af4a7f6dab1def9f369a877a5a7c5a12ba8cd1 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
@@ -64,6 +64,7 @@ var header = new Array("JobId",
                       "Durée",
                        "Fichiers",
                        "Taille",
+                       "Erreurs",
                       "Pool",
                        "Volumes utilisés",
                       "Statut");
@@ -71,7 +72,7 @@ var header = new Array("JobId",
 var data = new Array();
 
 img = document.createElement("IMG");
-img.src="/bweb/<TMPL_VAR JobStatus>.png";
+img.src=bweb_get_job_img("<TMPL_VAR JobStatus>", <TMPL_VAR joberrors>);
 img.title=jobstatus['<TMPL_VAR JobStatus>']; 
 
 data.push( new Array(
@@ -84,6 +85,7 @@ data.push( new Array(
 "<TMPL_VAR duration>",
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
+"<TMPL_VAR joberrors>",
 "<TMPL_VAR poolname>",
 "<TMPL_LOOP volumes><TMPL_VAR VolumeName>\n</TMPL_LOOP>",   
 img

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 75242cd7f9f06e39f19ca92f0a30d499d3b5858d..d9b6a1aac53dc5a8d5390744e03990d2798606ef 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1932,6 +1932,7 @@ SELECT DISTINCT Job.JobId       AS jobid,
                 JobFiles        AS jobfiles, 
                 JobBytes        AS jobbytes,
                JobStatus       AS jobstatus,
+                JobErrors       AS joberrors,
                 $self->{sql}->{SEC_TO_TIME}(  $self->{sql}->{UNIX_TIMESTAMP}(EndTime)  
                                             - $self->{sql}->{UNIX_TIMESTAMP}(StartTime)) AS duration
 

diff --git a/gui/bweb/tpl/display_job.tpl b/gui/bweb/tpl/display_job.tpl
index 07166751db4ca5c5f7713d54ccf09c461baaec14..4fa76933a1046d7dd37965d332ec709079f0c923 100644 (file)
--- a/gui/bweb/tpl/display_job.tpl
+++ b/gui/bweb/tpl/display_job.tpl
@@ -32,7 +32,7 @@ a = document.createElement('A');
 a.href='?action=job_zoom;jobid=<TMPL_VAR JobId>';
 
 img = document.createElement("IMG");
-img.src="/bweb/<TMPL_VAR JobStatus>.png";
+img.src=bweb_get_job_img("<TMPL_VAR JobStatus>", <TMPL_VAR joberrors>);
 img.title=jobstatus['<TMPL_VAR JobStatus>']; 
 
 a.appendChild(img);
@@ -48,7 +48,7 @@ data.push( new Array(
 "<TMPL_VAR Duration>",
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
-"<TMPL_VAR joberrors">",   
+"<TMPL_VAR joberrors>",   
 a
  )
 );

diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index 980192b925bf866986645228b7cddb49289fc255..0c2f29487ef00fa8c817e2c11646ef8459b5fac1 100644 (file)
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -64,6 +64,7 @@ var header = new Array("JobId",
                       "Duration",
                        "JobFiles",
                        "JobBytes",
+                       "Errors",
                       "Pool",
                        "Volume Name",
                       "Status");
@@ -71,7 +72,7 @@ var header = new Array("JobId",
 var data = new Array();
 
 img = document.createElement("IMG");
-img.src="/bweb/<TMPL_VAR JobStatus>.png";
+img.src=bweb_get_job_img("<TMPL_VAR JobStatus>", <TMPL_VAR joberrors>);
 img.title=jobstatus['<TMPL_VAR JobStatus>']; 
 
 data.push( new Array(
@@ -84,6 +85,7 @@ data.push( new Array(
 "<TMPL_VAR duration>",
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
+"<TMPL_VAR joberrors>",
 "<TMPL_VAR poolname>",
 "<TMPL_LOOP volumes><TMPL_VAR VolumeName>\n</TMPL_LOOP>",   
 img