bweb: Fix #1914 about broken link in Client - Current Jobs

diff --git a/gui/bweb/lang/en/tpl/client_list.tpl b/gui/bweb/lang/en/tpl/client_list.tpl
index 7eaf58b1229e05cf54f9f6ddea3878980c981d39..7a9afc8601b214fb81c736a5392d9904c1d2956a 100644 (file)
--- a/gui/bweb/lang/en/tpl/client_list.tpl
+++ b/gui/bweb/lang/en/tpl/client_list.tpl
@@ -11,7 +11,7 @@
         <div class="otherbox">
 <!--        <h1>Actions</h1> -->       
        <button type="submit" class="bp" name='action' value='job' title="Show last job"> <img src='/bweb/zoom.png' alt=''>Last jobs</button>
-       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Show current job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
+       <button type="submit" class="bp" name='action' value='running' title='Show current job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Show client status'> <img src='/bweb/zoom.png' alt=''>Status </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Client stats'> <img src='/bweb/chart.png' alt=''>Stats </button>

diff --git a/gui/bweb/lang/es/tpl/client_list.tpl b/gui/bweb/lang/es/tpl/client_list.tpl
index 0459f5c489012ebf95ada9ed76c802ed84aae2e3..ae5cceb19bc2323ed7a38db58bee0122203035e4 100644 (file)
--- a/gui/bweb/lang/es/tpl/client_list.tpl
+++ b/gui/bweb/lang/es/tpl/client_list.tpl
@@ -10,11 +10,11 @@
         </div>
         <div class="otherbox">
 <!--        <h1>Acciones</h1> -->      
-       <button type="submit" class="bp" name='action' value='job' title="Mostrar últimos jobs"> <img src='/bweb/zoom.png' alt=''>Últimos Jobs</button>
-       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Mostrar job actual'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
+       <button type="submit" class="bp" name='action' value='job' title="Mostrar últimos jobs"> <img src='/bweb/zoom.png' alt=''>Últimos Jobs</button>
+       <button type="submit" class="bp" name='action' value='running' title='Mostrar job actual'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Mostrar estado del cliente'> <img src='/bweb/zoom.png' alt=''>Estado </button>
-       <button type="submit" class="bp" name='action' value='client_stats' title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Estado </button>
+       <button type="submit" class="bp" name='action' value='client_stats' title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Estado </button>
        <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit groups </button>
         </div>
 

diff --git a/gui/bweb/lang/fr/tpl/client_list.tpl b/gui/bweb/lang/fr/tpl/client_list.tpl
index 6c13e52b2b72a2ae867d31f568017be05e10cac7..e6795ff48c29c991a2497cbdcc2475b64063fb31 100644 (file)
--- a/gui/bweb/lang/fr/tpl/client_list.tpl
+++ b/gui/bweb/lang/fr/tpl/client_list.tpl
@@ -11,7 +11,7 @@
         <div class="otherbox">
 <!--        <h1>Actions</h1> -->       
        <button type="submit" class="bp" name='action' value='job' title="Voir l'historique"> <img src='/bweb/zoom.png' alt=''>Historique</button>
-       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs courants</button>
+       <button type="submit" class="bp" name='action' value='running' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs courants</button>
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Statut </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Statistiques'> <img src='/bweb/chart.png' alt=''>Stats </button>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 5b6a189f76bdcf149863101ff56f8980145e3c05..52abe32c4ca41e6b31228ca75aed78fe4072a5c5 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -4170,6 +4170,12 @@ sub display_running_jobs
     my ($self, $display_action) = @_;
     return if $self->cant_do('r_view_running_job');
 
+    my $arg = $self->get_form('client');
+    my $client = "";
+    if ($arg->{client}) {
+        $client = " AND Client.Name = \'$arg->{client}\' ";
+    }
+
     # get security filter
     my $filter = $self->get_client_filter();
 
@@ -4186,6 +4192,7 @@ SELECT Job.JobId AS jobid,
 FROM Job INNER JOIN Client USING (ClientId) $filter
 WHERE 
   JobStatus IN ('C','R','B','e','D','F','S','m','M','s','j','c','d','t','p')
+  $client
 ";      
     my $all = $self->dbh_selectall_hashref($query, 'jobid') ;
     

diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index 5aee981ceef89478203c9a498d747fe8a37a6121..647abc601dc7992b8129e9b5366f7e1f6fd708b9 100644 (file)
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -11,7 +11,7 @@
         <div class="otherbox">
 <!--        <h1>__Actions__</h1> -->   
        <button type="submit" class="bp" name='action' value='job' title="__Show last job__"> <img src='/bweb/zoom.png' alt=''>__Last jobs__</button>
-       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='__Show current job__'> <img src='/bweb/zoom.png' alt=''>__Current jobs__</button>
+       <button type="submit" class="bp" name='action' value='running' title='__Show current job__'> <img src='/bweb/zoom.png' alt=''>__Current jobs__</button>
        <button type="submit" class="bp" name='action' value='groups' title='__View client groups__'> <img src='/bweb/zoom.png' alt=''>__View groups__</button>
        <button type="submit" class="bp" name='action' value='client_status' title='__Show client status__'> <img src='/bweb/zoom.png' alt=''>__Status__ </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='__Client stats__'> <img src='/bweb/chart.png' alt=''>__Stats__ </button>