ebl add a re-run option in display_job_zoom

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

diff --git a/gui/bweb/html/bweb.js b/gui/bweb/html/bweb.js
index 72b50e8f0e7576563ef00ed3911d5efb86dd16b6..78b2dc9f5f5b2499de3e71cb83d089b38d8e9ee1 100644 (file)
--- a/gui/bweb/html/bweb.js
+++ b/gui/bweb/html/bweb.js
@@ -73,6 +73,12 @@ var joblevel = {
  'B': 'Base level job'
 };
 
+var joblevelname = {
+ 'F': 'Full',
+ 'I': 'Incremental',
+ 'D': 'Differential',
+};
+
 
 var refresh_time = 60000;
 

diff --git a/gui/bweb/lang/es/tpl/display_job_zoom.tpl b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
index fd9f86bb6a95b866f76cfd9af7498231ed330f1f..b314ea95f06de32e26402df6158ab420072aba73 100644 (file)
--- a/gui/bweb/lang/es/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
@@ -51,7 +51,7 @@
   </label>
  </form>
  </td>
-<!-- Remove this to activate bfileview -->
+<!-- Remove this to activate bfileview 
  <td>
  <form action='bfileview.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
@@ -62,7 +62,21 @@
   </label>
  </form>
  </td>
-<!-- -->
+-->
+ <td>
+ <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+  <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
+  <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
+  <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
+  <input type='hidden' name='client' value='<TMPL_VAR client>'>
+  <input type='hidden' id="rerun_level" name='level'>
+  <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
+  <label>
+  <input type="image" name='action' value='run_job_mod' title='run this job again'
+   src='/bweb/R.png'> Run this job
+  </label>
+ </form>
+ </td>
  </table>
 </div>
 

diff --git a/gui/bweb/lang/es/tpl/run_job_mod.tpl b/gui/bweb/lang/es/tpl/run_job_mod.tpl
index 02291222cbc3423d72de1dad98ad10221019c12c..b38c21bbc6297d14e0c4ecdaf6163960fa1e3f71 100644 (file)
--- a/gui/bweb/lang/es/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/es/tpl/run_job_mod.tpl
@@ -124,7 +124,7 @@
      }
   </TMPL_IF>
   <TMPL_IF level>
-<!--     document.getElementById('level_<TMPL_VAR level>').selected=true; -->
+     document.getElementById('level_<TMPL_VAR level>').selected=true;
   </TMPL_IF>
   <TMPL_IF fileset>
      ok=1;

diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
index 1a21dd59ca601f51ef395d3ae46b6b5a50194021..9259ecdb6a7c2c240589b6e1f4cd9373bd5fbca6 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
@@ -59,12 +59,26 @@
   <label>
   <input type="image" name='action' value='bfileview' 
    title="Voir la répartition des fichiers"
-   onclick='if (<TMPL_VAR JobFiles> > 5000) { return confirm("Ce traitement peut prendre beaucoup de temps, voulez vous continuer ?")} else { return 1; }'
+   onclick='if (<TMPL_VAR JobFiles> > 5000) { return confirm("Ce traitement peut prendre beaucoup de temps, voulez vous continuer ?")} else { return 1;}'
    src='/bweb/colorscm.png'> Voir la répartition des fichiers
   </label>
  </form>
  </td>
 -->
+ <td>
+ <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+  <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
+  <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
+  <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
+  <input type='hidden' name='client' value='<TMPL_VAR client>'>
+  <input type='hidden' id="rerun_level" name='level'>
+  <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
+  <label>
+  <input type="image" name='action' value='run_job_mod' title='Relancer ce job'
+   src='/bweb/R.png'> Relancer ce job
+  </label>
+ </form>
+ </td>
  </table>
 </div>
 

diff --git a/gui/bweb/lang/fr/tpl/run_job_mod.tpl b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
index 4bf8ea270366f3929eaa5e48531fe2c04534f972..dcb0a147633e122e031dd084e850bbcdff1f035e 100644 (file)
--- a/gui/bweb/lang/fr/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
@@ -124,7 +124,7 @@
      }
   </TMPL_IF>
   <TMPL_IF level>
-<!--     document.getElementById('level_<TMPL_VAR level>').selected=true; -->
+    document.getElementById('level_<TMPL_VAR level>').selected=true;
   </TMPL_IF>
   <TMPL_IF fileset>
      ok=1;

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 307194a327caef65fb74ec5f95ee40b02441c189..e978fdcaacacb88083949cce436e2f61b4d2a2fa 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3239,8 +3239,12 @@ sub run_job_mod
     
     my $job = CGI::param('job') || '';
 
+    # we take informations from director, and we overwrite with user wish
     my $info = $b->send_cmd("show job=\"$job\"");
     my $attr = $self->run_parse_job($info);
+
+    my $arg = $self->get_form('pool', 'level', 'client', 'fileset', 'storage');
+    my %job_opt = (%$attr, %$arg);
     
     my $jobs   = [ map {{ name => $_ }} $b->list_job() ];
 
@@ -3255,7 +3259,7 @@ sub run_job_mod
        clients  => $clients,
        filesets => $filesets,
        storages => $storages,
-       %$attr,
+       %job_opt,
     }, "run_job_mod.tpl");
 }
 

diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index f8b29fe1b89b50ad15e779ce210a13a112b54aef..a9b30f386a47226aca979b164202724b48a68bf9 100644 (file)
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -51,7 +51,7 @@
   </label>
  </form>
  </td>
-<!-- Remove this to activate bfileview -->
+<!-- Remove this to activate bfileview 
  <td>
  <form action='bfileview.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
@@ -62,7 +62,21 @@
   </label>
  </form>
  </td>
-<!-- -->
+-->
+ <td>
+ <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+  <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
+  <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
+  <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
+  <input type='hidden' name='client' value='<TMPL_VAR client>'>
+  <input type='hidden' id="rerun_level" name='level'>
+  <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
+  <label>
+  <input type="image" name='action' value='run_job_mod' title='run this job again'
+   src='/bweb/R.png'> Run this job
+  </label>
+ </form>
+ </td>
  </table>
 </div>
 

diff --git a/gui/bweb/tpl/run_job_mod.tpl b/gui/bweb/tpl/run_job_mod.tpl
index 5d6740c935e4ff99d825edd16559d3152dfa1bc6..6a48add66e58c0fee1cc8fde34fcaae99bc2654c 100644 (file)
--- a/gui/bweb/tpl/run_job_mod.tpl
+++ b/gui/bweb/tpl/run_job_mod.tpl
@@ -124,7 +124,7 @@
      }
   </TMPL_IF>
   <TMPL_IF level>
-<!--     document.getElementById('level_<TMPL_VAR level>').selected=true; -->
+     document.getElementById('level_<TMPL_VAR level>').selected=true; 
   </TMPL_IF>
   <TMPL_IF fileset>
      ok=1;