bweb: Add fullname option to btime for regress testing purpose

diff --git a/gui/bweb/cgi/btime.pl b/gui/bweb/cgi/btime.pl
index 215632bb1329b76dc3a671c7e4d75fbede14e34e..d84da26f81f43f446af2f6bd07110a88553f8439 100755 (executable)
--- a/gui/bweb/cgi/btime.pl
+++ b/gui/bweb/cgi/btime.pl
@@ -64,7 +64,8 @@ use Digest::MD5 qw(md5_hex);
 my $md5_rep = md5_hex("$arg->{qiso_begin}:$arg->{qiso_end}:$arg->{qusage}:" . 
                      "$arg->{jclient_groups}:$arg->{qpoolusage};$arg->{qnojob}") ;
 
-if (   !$arg->{qnocache} 
+if ( 0 
+    &&  !$arg->{qnocache} 
     && $arg->{qiso_begin} 
     && -f "$conf->{fv_write_path}/$md5_rep.png") 
 {

diff --git a/gui/bweb/lang/en/tpl/btime.tpl b/gui/bweb/lang/en/tpl/btime.tpl
index e52b3102a9f96675f7b54f3131fb2e370b21d23b..194e917e2e235ccad4db862be6ae47a895b678e6 100644 (file)
--- a/gui/bweb/lang/en/tpl/btime.tpl
+++ b/gui/bweb/lang/en/tpl/btime.tpl
@@ -42,6 +42,9 @@
       <input type='checkbox' 
              <TMPL_IF qbypool>checked</TMPL_IF> 
              name="bypool"> Order by Pool<br/>
+      <input type='checkbox' 
+             <TMPL_IF qfullname>checked</TMPL_IF> 
+             name="fullname"> Use Job name<br/>
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>

diff --git a/gui/bweb/lang/es/tpl/btime.tpl b/gui/bweb/lang/es/tpl/btime.tpl
index 74272db94867a62827f34dc11ff5f617e9bf9542..ba8f5feb1393231e83d768c32071b1ecf7cd9e3b 100644 (file)
--- a/gui/bweb/lang/es/tpl/btime.tpl
+++ b/gui/bweb/lang/es/tpl/btime.tpl
@@ -42,6 +42,9 @@
       <input type='checkbox' 
              <TMPL_IF qbypool>checked</TMPL_IF> 
              name="bypool"> Order by Pool<br/>
+      <input type='checkbox' 
+             <TMPL_IF qfullname>checked</TMPL_IF> 
+             name="fullname"> Use Job name<br/>
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>
@@ -92,12 +95,12 @@
     <h2>Tiempo</h2>
     <select name='age' class='formulaire'>
       <option id='age_604800'   value='604800'>Esta Semana</option>
-      <option id='age_2678400'  value='2678400'>Últimos 30 días</option>
-      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
+      <option id='age_2678400'  value='2678400'>Últimos 30 días</option>
+      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
     </select>     
   </td>
   <td  valign='top'>
-    <h2>Tamaño</h2>
+    <h2>Tamaño</h2>
      Ancho: &nbsp;<input class='formulaire' type='text' 
                         name='width' value='<TMPL_VAR width>' size='4'><br/>
      Alto:  <input type='text' class='formulaire' 

diff --git a/gui/bweb/lang/fr/tpl/btime.tpl b/gui/bweb/lang/fr/tpl/btime.tpl
index d9a90918077714a151f77084f2d4310874e921d1..27c7dcd990f746b0fcd40ff1bac5e38e35ba1e59 100644 (file)
--- a/gui/bweb/lang/fr/tpl/btime.tpl
+++ b/gui/bweb/lang/fr/tpl/btime.tpl
@@ -42,6 +42,9 @@
       <input type='checkbox' 
              <TMPL_IF qbypool>checked</TMPL_IF> 
              name="bypool"> Order by Pool<br/>
+      <input type='checkbox' 
+             <TMPL_IF qfullname>checked</TMPL_IF> 
+             name="fullname"> Use Job name<br/>
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>
@@ -57,7 +60,7 @@
 <TMPL_IF db_pools>
 <tr>
   <td valign='top'>
-    <h2>Pools de média</h2>
+    <h2>Pools de média</h2>
     <select name='pool' size='10' class='formulaire' multiple>
 <TMPL_LOOP db_pools>
        <option id= 'pool_<TMPL_VAR name>'><TMPL_VAR name></option>
@@ -89,7 +92,7 @@
 </tr>
 <tr>
   <td valign='top'>
-    <h2>Période</h2>
+    <h2>Période</h2>
     <select name='age' class='formulaire'>
       <option id='age_604800'   value='604800'>Cette semaine</option>
       <option id='age_2678400'  value='2678400'>30 derniers jours</option>
@@ -139,7 +142,7 @@
  Current &nbsp;
  </div>
  <div class="otherbox">
- <img src='<TMPL_VAR result>' alt='Rien n a afficher, essayer avec une autre période'>
+ <img src='<TMPL_VAR result>' alt='Rien n a afficher, essayer avec une autre période'>
  </div>
 
 </td>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d0be07ebc91bfae0761f0a364d5cfa2a08036f34..b0e19f8efb61f9c00e0c4632c428e437e5327a59 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1279,7 +1279,7 @@ use base q/Bweb::Gui/;
 use DBI;
 use POSIX qw/strftime/;
 
-our $config_file='/etc/bacula/bweb.conf';
+our $config_file='./bweb/bweb.conf';
 our $cur_id=0;
 
 =head1 VARIABLE

diff --git a/gui/bweb/tpl/btime.tpl b/gui/bweb/tpl/btime.tpl
index 040293e4680a8507a1cee2ad115a0e0cd683847c..a08c9c99138589fbd8c3d738c056ab18c1466daa 100644 (file)
--- a/gui/bweb/tpl/btime.tpl
+++ b/gui/bweb/tpl/btime.tpl
@@ -42,6 +42,9 @@
       <input type='checkbox' 
              <TMPL_IF qbypool>checked</TMPL_IF> 
              name="bypool"> __Order by Pool__<br/>
+      <input type='checkbox' 
+             <TMPL_IF qfullname>checked</TMPL_IF> 
+             name="fullname"> __Use Job name__<br/>
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>

diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index 773bf8b5c90af23a634d478aada22c3b40576b26..b8a8bbc60c4b5a13907cf306864acad490a86411 100644 (file)
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -10,7 +10,7 @@
      <tr><td>__DBI:__</td>     
          <td> 
           <input class="formulaire" 
-title='DBI:Pg:database=bacula;host=yourhost  or  DBI:Mysql:database=bacula   or...' 
+title='DBI:Pg:database=bacula;host=yourhost  or  DBI:mysql:database=bacula   or...' 
                  type='text' value='<TMPL_VAR dbi>' size='64' name='dbi'> 
          </td>
      </tr>
@@ -77,4 +77,4 @@ title='DBI:Pg:database=bacula;host=yourhost  or  DBI:Mysql:database=bacula   or.
 <TMPL_IF lang>
   document.getElementById('lang_<TMPL_VAR lang>').selected = true;
 </TMPL_IF>
-</script>
\ No newline at end of file
+</script>