ebl Add warning in display_job

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

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index f49bb2a0eb073d6cbc21acc4bd3387be31794467..c334dfbda59bdbe37c0a5154d1c5f28ffd74bbed 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -2,6 +2,7 @@
 
 2007/03/01
  - Add display_time_log option to get timestamp in display_log
+ - Add Warning filter on display_job (see jobstatus=T and joberrors > 0)
 
 2007/02/28
  - Add limit and offset params to display_log

diff --git a/gui/bweb/lang/es/tpl/display_form_job.tpl b/gui/bweb/lang/es/tpl/display_form_job.tpl
index 75acd9cc2637979c98838d724aecd378623f02a0..acc13b76f993c4c83a5416478845e4fd739253bc 100644 (file)
--- a/gui/bweb/lang/es/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/es/tpl/display_form_job.tpl
@@ -22,6 +22,7 @@
     <select name='status' class='formulaire'>
       <option id='status_Any' value='Any'>Cualquiera</option>
       <option id='status_T'   value='T'>Ok</option>
+      <option id='status_W'   value='W'>Warning</option>
       <option id='status_f'   value='f'>Error</option>
       <option id='status_A'   value='A'>Cancelados</option>
     </select>     

diff --git a/gui/bweb/lang/fr/tpl/display_form_job.tpl b/gui/bweb/lang/fr/tpl/display_form_job.tpl
index f205dd0407012296f6538a340d9a273df437f1a0..0402547dabab2c7098eaa89570d360ef570ba8a2 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_form_job.tpl
@@ -22,6 +22,7 @@
     <select name='status' class='formulaire'>
       <option id='status_Any' value='Any'>Tous</option>
       <option id='status_T'   value='T'>Ok</option>
+      <option id='status_W'   value='W'>Warning</option>
       <option id='status_f'   value='f'>Erreur</option>
       <option id='status_A'   value='A'>Annulé</option>
     </select>     

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index e0a445f7ac7e0bbcc73a7b78ca1864d578f1539b..8676a3f8a542ae39ed999eb2fcf9b7773a236aa8 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1841,7 +1841,9 @@ sub get_param
            $ret{status} = $1;
            if ($1 eq 'f') {
                $limit .= "AND Job.JobStatus IN ('f','E') ";            
-           } else {
+           } elsif ($1 eq 'W') {
+               $limit .= "AND Job.JobStatus = 'T' AND Job.JobErrors > 0 ";             
+            } else {
                $limit .= "AND Job.JobStatus = '$1' ";          
            }
        }

diff --git a/gui/bweb/tpl/display_form_job.tpl b/gui/bweb/tpl/display_form_job.tpl
index 370a8e1493ca7c13ecd7f3e562bae2cf7890abdb..5368ed591e7c6b13205d20a2b86f60b28a4913f5 100644 (file)
--- a/gui/bweb/tpl/display_form_job.tpl
+++ b/gui/bweb/tpl/display_form_job.tpl
@@ -22,6 +22,7 @@
     <select name='status' class='formulaire'>
       <option id='status_Any' value='Any'>Any</option>
       <option id='status_T'   value='T'>Ok</option>
+      <option id='status_W'   value='W'>Warning</option>
       <option id='status_f'   value='f'>Error</option>
       <option id='status_A'   value='A'>Canceled</option>
     </select>