From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 28 Nov 2007 12:13:20 +0000 (+0000)
Subject: ebl  Fix the time slice between overview and overview_zoom
X-Git-Tag: Release-3.0.0~2194
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b921f6af1d750015cb226fe8ac0e0b85f164daf8;p=bacula%2Fbacula

ebl  Fix the time slice between overview and overview_zoom



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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 0caba34274..94fa818ce4 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3318,10 +3318,11 @@ sub make_overview_tab
 sub get_time_overview
 {
     my ($self, $arg) = @_; # want since et age from get_form();
-    my $type = CGI::param('type') || 'day';
+    my $type = $arg->{type} || 'day';
     if ($type =~ /^(day|week|hour|month)$/) {
 	$type = uc($1);
     } else {
+	$arg->{type}='day';
 	$type = 'DAY';
     }
     my $jobt = $self->{info}->{stat_job_table} || 'Job';
@@ -3344,7 +3345,7 @@ sub display_overview_zoom
     my ($self) = @_;
     $self->can_do('r_view_stat');
 
-    my $arg = $self->get_form(qw/jclient_groups age since/);
+    my $arg = $self->get_form(qw/jclient_groups age since type/);
 
     if (!$arg->{jclient_groups}) {
 	return $self->error("Can't get client_group selection");
@@ -3376,7 +3377,7 @@ FROM (
 ";
     my $items = $self->make_overview_tab($q);
     $self->display({label => $label,
-		    action => "job;since=$arg->{since};age=$arg->{age};client=", 
+		    action => "job;since=$arg->{since};type=$arg->{type};age=$arg->{age};client=", 
 		    items => $items}, "overview.tpl");
 }
 
@@ -3385,7 +3386,7 @@ sub display_overview
     my ($self) = @_ ;
     $self->can_do('r_view_stat');
 
-    my $arg = $self->get_form(qw/jclient_groups age since/);
+    my $arg = $self->get_form(qw/jclient_groups age since type/);
     my ($filter2, undef) = $self->get_param(qw/client_groups level jobtype/);
     my $filter3 = $self->get_client_group_filter();
     my ($stime1, $stime2, $filter1, $label, $jobt) = $self->get_time_overview($arg);
@@ -3410,7 +3411,7 @@ FROM (
 ";
     my $items = $self->make_overview_tab($q);
     $self->display({label=>$label,
-		    action => "overview_zoom;since=$arg->{since};age=$arg->{age};client_group=", 
+		    action => "overview_zoom;since=$arg->{since};type=$arg->{type};age=$arg->{age};client_group=", 
 		    items => $items}, "overview.tpl");
 
 }
diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 41421e8c4f..8d98767525 100644
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,6 @@
+28Nov07
+ebl  Fix the time slice between overview and overview_zoom 
+
 26Nov07
 ebl  Fix overview to works with mysql
 ebl  Add date support to bresto