From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 9 Mar 2008 22:30:33 +0000 (+0000)
Subject: ebl  Bugfix on display running jobs
X-Git-Tag: Release-3.0.0~1718
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed2116dbe9567137e4463c0c25d13e5bd394b10b;p=bacula%2Fbacula

ebl  Bugfix on display running jobs


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

diff --git a/gui/bweb/lang/en/tpl/client_job_status.tpl b/gui/bweb/lang/en/tpl/client_job_status.tpl
index 77d478369a..4955bef96f 100644
--- a/gui/bweb/lang/en/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/en/tpl/client_job_status.tpl
@@ -26,6 +26,8 @@
  <tr>
   <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
  </tr>
+</TMPL_IF>
+<TMPL_IF last_jobfiles>
  <tr>
   <td> <b> Files done </b> </td><td> <div id='progress2'><td>
  </tr>
@@ -43,8 +45,10 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-<TMPL_IF last_jobbytes>
+<TMPL_IF last_jobfiles>
   percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, document.getElementById('progress1'));
+</TMPL_IF>
+<TMPL_IF last_jobbytes>
   percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, document.getElementById('progress2'));
 </TMPL_IF>
   bweb_add_refresh();
diff --git a/gui/bweb/lang/en/tpl/cmd_storage.tpl b/gui/bweb/lang/en/tpl/cmd_storage.tpl
index 227388a675..3340beb4c8 100644
--- a/gui/bweb/lang/en/tpl/cmd_storage.tpl
+++ b/gui/bweb/lang/en/tpl/cmd_storage.tpl
@@ -1,6 +1,6 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Manage Storage device</h1>
+  <h1 class='newstitle'> Manage Storage devices</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
diff --git a/gui/bweb/lang/es/tpl/client_job_status.tpl b/gui/bweb/lang/es/tpl/client_job_status.tpl
index 5d4caf1dee..6064d4f383 100644
--- a/gui/bweb/lang/es/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/es/tpl/client_job_status.tpl
@@ -26,6 +26,8 @@
  <tr>
   <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
  </tr>
+</TMPL_IF>
+<TMPL_IF last_jobfiles>
  <tr>
   <td> <b> Files done </b> </td><td> <div id='progress2'><td>
  </tr>
@@ -43,8 +45,10 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-<TMPL_IF last_jobbytes>
+<TMPL_IF last_jobfiles>
   percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, document.getElementById('progress1'));
+</TMPL_IF>
+<TMPL_IF last_jobbytes>
   percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, document.getElementById('progress2'));
 </TMPL_IF>
   bweb_add_refresh();
diff --git a/gui/bweb/lang/es/tpl/cmd_storage.tpl b/gui/bweb/lang/es/tpl/cmd_storage.tpl
index 675733aed9..fd757db55b 100644
--- a/gui/bweb/lang/es/tpl/cmd_storage.tpl
+++ b/gui/bweb/lang/es/tpl/cmd_storage.tpl
@@ -1,6 +1,6 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Manage Storage device</h1>
+  <h1 class='newstitle'> Manage Storage devices</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
diff --git a/gui/bweb/lang/fr/tpl/client_job_status.tpl b/gui/bweb/lang/fr/tpl/client_job_status.tpl
index 7973244e82..d9b6d5b1d9 100644
--- a/gui/bweb/lang/fr/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/fr/tpl/client_job_status.tpl
@@ -26,6 +26,8 @@
  <tr>
   <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
  </tr>
+</TMPL_IF>
+<TMPL_IF last_jobfiles>
  <tr>
   <td> <b> Files done </b> </td><td> <div id='progress2'><td>
  </tr>
@@ -43,8 +45,10 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-<TMPL_IF last_jobbytes>
+<TMPL_IF last_jobfiles>
   percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, document.getElementById('progress1'));
+</TMPL_IF>
+<TMPL_IF last_jobbytes>
   percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, document.getElementById('progress2'));
 </TMPL_IF>
   bweb_add_refresh();
diff --git a/gui/bweb/lang/fr/tpl/cmd_storage.tpl b/gui/bweb/lang/fr/tpl/cmd_storage.tpl
index bbea83d044..b0ba9092bb 100644
--- a/gui/bweb/lang/fr/tpl/cmd_storage.tpl
+++ b/gui/bweb/lang/fr/tpl/cmd_storage.tpl
@@ -1,6 +1,6 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Manage Storage device</h1>
+  <h1 class='newstitle'> Manage Storage devices</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 5ccee8ca92..1785cc463f 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -423,8 +423,8 @@ use base q/Bweb::Gui/;
 
 sub display_running_job
 {
-    my ($self, $conf, $jobid, $last_jobfiles, $last_jobbytes) = @_ ;
-    my $status = $self->status($conf);
+    my ($self, $bweb, $jobid, $last_jobfiles, $last_jobbytes) = @_ ;
+    my $status = $self->status($bweb->{info});
 
     if ($jobid) {
 	if ($status->{$jobid}) {
@@ -435,11 +435,11 @@ sub display_running_job
 	    $status->{jobbytes} =~ s![, B/s]!!g;
 	    $status->{jobfiles}=$status->{Files}; 
 	    $status->{jobfiles} =~ s/,//g;
-	    $self->display($status, "client_job_status.tpl");
+	    $bweb->display($status, "client_job_status.tpl");
 	}
     } else {
 	for my $id (keys %$status) {
-	    $self->display($status->{$id}, "client_job_status.tpl");
+	    $bweb->display($status->{$id}, "client_job_status.tpl");
 	}
     }
 }
@@ -3927,7 +3927,7 @@ FROM (
 	}
     }
     my $cli = new Bweb::Client(name => $arg->{client});
-    $cli->display_running_job($self->{info}, $arg->{jobid}, 
+    $cli->display_running_job($self, $arg->{jobid}, 
 			      $arg->{jobfiles}, $arg->{jobbytes});
     if ($arg->{jobid}) {
 	$self->get_job_log();
diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index 7bcdd2e1a1..0ce4d6bfb2 100644
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -26,6 +26,8 @@
  <tr>
   <td> <b> __Bytes done__ </b> </td><td> <div id='progress1'><td>
  </tr>
+</TMPL_IF>
+<TMPL_IF last_jobfiles>
  <tr>
   <td> <b> __Files done__ </b> </td><td> <div id='progress2'><td>
  </tr>
@@ -43,8 +45,10 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-<TMPL_IF last_jobbytes>
+<TMPL_IF last_jobfiles>
   percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, document.getElementById('progress1'));
+</TMPL_IF>
+<TMPL_IF last_jobbytes>
   percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, document.getElementById('progress2'));
 </TMPL_IF>
   bweb_add_refresh();
diff --git a/gui/bweb/tpl/cmd_storage.tpl b/gui/bweb/tpl/cmd_storage.tpl
index 566f3ec508..2d01f435f5 100644
--- a/gui/bweb/tpl/cmd_storage.tpl
+++ b/gui/bweb/tpl/cmd_storage.tpl
@@ -1,6 +1,6 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> __Manage Storage device__</h1>
+  <h1 class='newstitle'> __Manage Storage devices__</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>