From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 3 Apr 2008 14:08:04 +0000 (+0000)
Subject: ebl  remove progress bar from restore
X-Git-Tag: Release-3.0.0~1616
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f542147ee3486a52e4d66695b761e31d74ffff76;p=bacula%2Fbacula

ebl  remove progress bar from restore


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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d72333b357..647101ae28 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3962,7 +3962,7 @@ sub display_running_job
 
     my $query = "
 SELECT Client.Name AS name, Job.Name AS jobname, 
-       Job.Level AS level
+       Job.Level AS level, Type AS type
 FROM Job INNER JOIN Client USING (ClientId) $filter
 WHERE Job.JobId = $arg->{jobid}
 ";
@@ -3975,21 +3975,23 @@ WHERE Job.JobId = $arg->{jobid}
 	return $self->error("Can't get client");
     }
 
-    # for jobfiles, we use only last Full backup. status client= returns
-    # all files that have been checked
-    my $query1 = $self->get_estimate_query('jobfiles', $row->{jobname}, 'F');
-    my $query2 = $self->get_estimate_query('jobbytes', 
-					   $row->{jobname}, $row->{level});
+    if ($row->{type} eq 'B') {
+	# for jobfiles, we use only last Full backup. status client= returns
+	# all files that have been checked
+	my $query1 = $self->get_estimate_query('jobfiles', $row->{jobname}, 'F');
+	my $query2 = $self->get_estimate_query('jobbytes', 
+					       $row->{jobname}, $row->{level});
 
-    # LEFT JOIN because we always have a previous Full
-    $query = "
+	# LEFT JOIN because we always have a previous Full
+	$query = "
 SELECT  corr_jobbytes, jobbytes, corr_jobfiles, jobfiles
   FROM ($query1) AS A LEFT JOIN ($query2) AS B USING (jobname)
 ";
-    $row = $self->dbh_selectrow_hashref($query);
+	$row = $self->dbh_selectrow_hashref($query);
 
-    if (!$row) {
-	$row->{jobbytes} = $row->{jobfiles} = 0;
+	if (!$row) {
+	    $row->{jobbytes} = $row->{jobfiles} = 0;
+	}
     }
     my $cli = new Bweb::Client(name => $arg->{client});
     $cli->display_running_job($self, $arg->{jobid}, $row);
diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index bc325b1119..3a36ef4e41 100644
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,5 +1,6 @@
 03Apr08
 ebl  Tweak progress bar and add Backuped files count to job status
+ebl  Remove progress bar from restore
 
 02Apr08
 ebl  Add group statistics page