ebl add display_log_time option

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

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index bd13e44736f863d3377e5d261e8de0fb0ed4b1ee..f49bb2a0eb073d6cbc21acc4bd3387be31794467 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -1,4 +1,8 @@
           Release Notes for bweb 2.0
+
+2007/03/01
+ - Add display_time_log option to get timestamp in display_log
+
 2007/02/28
  - Add limit and offset params to display_log
 

diff --git a/gui/bweb/lang/es/tpl/config_edit.tpl b/gui/bweb/lang/es/tpl/config_edit.tpl
index 97fbc397f717aa3097639a8309bfbfcedf724250..3c9b6900be99f072cf458419783a0183d150481e 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_edit.tpl
+++ b/gui/bweb/lang/es/tpl/config_edit.tpl
@@ -43,6 +43,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <tr><td>display_log_time :</td>
+         <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
+         </td></tr>
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lang/es/tpl/config_view.tpl b/gui/bweb/lang/es/tpl/config_view.tpl
index f3db685f63c458335f187b10a3a225fc07e6e387..7380b743d857aa316516fba8eb9ca6d9394941f9 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_view.tpl
+++ b/gui/bweb/lang/es/tpl/config_view.tpl
@@ -17,6 +17,7 @@
     <tr><td title="Este directorio debe tener permisos de escritura para el usuario apache y debe ser accesible en /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/a/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
+    <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Libreria</b></td>  <td/></tr>

diff --git a/gui/bweb/lang/fr/tpl/config_edit.tpl b/gui/bweb/lang/fr/tpl/config_edit.tpl
index cd60610f21592e7df82ddc627ace81e090565392..847c404059ad66ea4868737a867d066642c5b77a 100644 (file)
--- a/gui/bweb/lang/fr/tpl/config_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/config_edit.tpl
@@ -44,6 +44,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf" type='text' value='<TMPL_VAR NAME=bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <tr><td>display_log_time :</td>
+         <td> <input class="formulaire" title="affiche les heures dans les logs" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
+         </td></tr>
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d2679c825d1d2cfb329cebdcc99e588d09dffb37..e0a445f7ac7e0bbcc73a7b78ca1864d578f1539b 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -216,6 +216,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
              syslog_file => qr!^(.+)?$!,
              log_dir     => qr!^(.+)?$!,
              stat_job_table => qr!^(\w*)$!,
+             display_log_time => qr!^(on)?$!,
              );
 
 =head1 FUNCTION
@@ -2965,7 +2966,7 @@ sub get_job_log
         $arg->{limit} = 1000;
     }
 
-    my $t = CGI::param('time') || '';
+    my $t = CGI::param('time') || $self->{info}->{display_log_time} || '';
 
     my $query = "
 SELECT Job.Name as name, Client.Name as clientname

diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index b30a8bec196fb55b4be2c2c501cea2e60d6d5134..c918cf29885afad17cc10ab0b76d6598c24ae707 100644 (file)
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -43,6 +43,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <tr><td>display_log_time :</td> 
+         <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
+         </td></tr>
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index f3c40546d61fd8b414ad6ade8e234a825d9dba75..5056458da267066bd9b71c9ad0b1ffc10ed21e56 100644 (file)
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -17,6 +17,7 @@
     <tr><td title="This folder must be writable by apache user and must be accessible on /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
+    <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Autochanger</b></td>  <td/></tr>