ebl Add an option to bgraph that shows each levels as different source

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

diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index e232e5fdd2f90c433a5724158b3453e27342bd09..6389b1c2f273f9d9679fc0c7d099eac3299b3d44 100755 (executable)
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -79,7 +79,7 @@ if ($arg->{status} and $arg->{status} ne 'Any') {
 }
     
 my $levelq='';
-if ($arg->{level} and $arg->{level} ne 'Any') {
+if ($arg->{level} and $arg->{level} !~ 'All|Any') {
     $levelq = " AND Job.Level = '$arg->{level}' ";
 } 
 
@@ -232,9 +232,12 @@ sub make_tab
     my $ret = {};
     
     foreach my $row (@$all_row) {
-       # Todo, add Level to label if option is set ->[4]
        my $label = $row->[1] . "/" . $row->[2] ; # client/backup name
 
+       if ($arg->{level} eq 'All') {             # can separate level
+           $label = $row->[4] . ': ' . $label;   # if users ask for
+       }
+
        $ret->{date}->[$i]   = $row->[0];       
        $ret->{$label}->[$i] = $row->[3];
        $i++;

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index d61e392ae09250489a4d7657e0ed48ba6a548b4d..d56c2e0168e0bd68e8d71d703f341f0b2d0a342c 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,5 @@
+22Sep08
+ebl  Add an option to bgraph that shows each levels as different source
 21Sep08
 ebl  
  bfileview: 

diff --git a/gui/bweb/tpl/graph.tpl b/gui/bweb/tpl/graph.tpl
index 47efd7e611d6f93fd44149ac98bc76dcbd111687..f86a2b470c649704bb05d5c7ccf525e48f0c6855 100644 (file)
--- a/gui/bweb/tpl/graph.tpl
+++ b/gui/bweb/tpl/graph.tpl
@@ -15,7 +15,8 @@
   <td valign='top'>
     <h2>__Level__</h2>
     <select name='level' class='formulaire'>
-      <option id='level_Any' value='Any'>__Any__</option>
+      <option id='level_Any' title='__Any level (grouped)__' value='Any'>__Any__</option>
+      <option id='level_All' title='__All levels (separated)__' value='All'>__All__</option>
       <option id='level_F' value='F'>__Full__</option>
       <option id='level_D' value='D'>__Differential__</option>
       <option id='level_I' value='I'>__Incremental__</option>