ebl Add pool filter to job form

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

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index e9a8eb250c694f591915225028eeee70e1707cad..9e7b58b6243494cbe120ec86d52fa7a23ef8641f 100755 (executable)
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -273,7 +273,7 @@ if ($action eq 'begin') {           # main display
     print "<div><table border='0'><tr><td valign='top'>\n";
     my $fields = $bweb->get_form(qw/status level db_clients db_filesets
                                    limit age offset qclients qfilesets
-                                   jobtype/);
+                                   jobtype qpools db_pools/);
     $bweb->display($fields, "display_form_job.tpl");
 
     print "</td><td valign='top'>";

diff --git a/gui/bweb/lang/fr/tpl/display_form_job.tpl b/gui/bweb/lang/fr/tpl/display_form_job.tpl
index 8d5ce19060d91c81af822d6dce0864ca29ef43a2..07108185b21c753efafd7520876e71a46a44b9fd 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_form_job.tpl
@@ -27,6 +27,17 @@
     </select>     
   </td>
 </tr>
+<tr>
+ <td valign='top'>
+    <h2>Pool</h2>
+    <select name='pool' class='formulaire'>
+      <option id='pool_tout' value=''>Tous</option>
+<TMPL_LOOP NAME=db_pools>
+      <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
+</TMPL_LOOP>
+    </select>
+  </td>
+</tr>
 <tr>
   <td valign='top'>
     <h2>Période</h2>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 74bd1eee93ce38c96a53de1f60597f258da53286..a044626560372082d0aa66aeeb0dd7c843dadf54 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1910,6 +1910,7 @@ sub display_job
                                          'level',
                                          'filesets',
                                          'jobtype',
+                                         'pools',
                                          'jobid',
                                          'status');
 

diff --git a/gui/bweb/tpl/display_form_job.tpl b/gui/bweb/tpl/display_form_job.tpl
index 9945460190a3367bb67ddac27064c8417f1d4d08..a45e54d27792c68ceaaa1d5719c058bbcc712567 100644 (file)
--- a/gui/bweb/tpl/display_form_job.tpl
+++ b/gui/bweb/tpl/display_form_job.tpl
@@ -27,6 +27,17 @@
     </select>     
   </td>
 </tr>
+<tr>
+ <td valign='top'>
+    <h2>Pool</h2>
+    <select name='pool' class='formulaire'>
+      <option id='pool_all' value=''>All</option>
+<TMPL_LOOP NAME=db_pools>
+      <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
+</TMPL_LOOP>
+    </select>
+  </td>
+</tr>
 <tr>
   <td valign='top'>
     <h2>Age</h2>