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 77d478369aa5250ef468d28e1800c3304a0af09d..4955bef96f5e0cefdd53452a1438a7e3d403286c 100644 (file)
--- 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 227388a675e6da111d4bfef454c035dde0b26ae2..3340beb4c8e93146591e0f1169f4c004f4558c30 100644 (file)
--- 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 5d4caf1dee24a7fbb607f60c4e361bbdd2619deb..6064d4f383ab8c7dff0ed0fae8030ec7a0eae97f 100644 (file)
--- 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 675733aed9317d5b7a936f002eeb79088005e898..fd757db55b7ca9cb4f5b718866c2333312cef7c6 100644 (file)
--- 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 7973244e828537bae07fd058a8bbe427a3d3e879..d9b6d5b1d9de8bb232d14d6f12390796033a600d 100644 (file)
--- 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 bbea83d044d31c340931df62399544edb1536ec6..b0ba9092bbd944cdc30bb328cca87ed9dfb07f9a 100644 (file)
--- 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 5ccee8ca92e8c44017068f41a208ef7737953962..1785cc463f8bc7c59b53cb19db7c71be221a3c14 100644 (file)
--- 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 7bcdd2e1a19ee015797626fa45a91518b5077ed6..0ce4d6bfb2e77dc243b44bd1e630e5166d9130bf 100644 (file)
--- 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 566f3ec5083e45bb37f58b5268b43bb4fb172a24..2d01f435f52cc564d9b1b63bfe133e5dde59de89 100644 (file)
--- 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'>