ebl dont display running job in display_job

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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index b812b1d9381ac35b8decf43c1f6e72a26d36f053..90ab2f9a654b0528653154de4ad8b600e64337bc 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1897,6 +1897,7 @@ SELECT  Job.JobId       AS jobid,
       Job LEFT JOIN Pool     ON (Job.PoolId    = Pool.PoolId)
           LEFT JOIN FileSet  ON (Job.FileSetId = FileSet.FileSetId)
  WHERE Client.ClientId=Job.ClientId
+   AND Job.JobStatus != 'R'
  $where
  $limit
 ";

diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index a650464082b85820da46f208b23a2a5ef1f1a571..aaf280947bd06fc96f9e8e9444c19731b9976bf1 100644 (file)
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -23,9 +23,6 @@
   <td> <b> Bytes: </b> <td> <td> <TMPL_VAR bytes></td>
  </tr>
 </table>
-
- </div>
-
 <form name='form1' action='?' method='GET'>
 <input type="image" name='action' value='dsp_cur_job' 
  src='/bweb/update.png' title='refresh'>&nbsp;
@@ -34,7 +31,7 @@
 <input type="image" name='action' value='cancel_job'
         title='Cancel job' src='/bweb/cancel.png'>&nbsp;
 </form>
-
+ </div>
 
 <script type="text/javascript" language="JavaScript">
   bweb_add_refresh();