ebl fix add_media feature

     detect pool from pool argument or media in run_job_mod

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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 7d221eb11d66c852066507bcefaf964850a0e09e..742f80fc3813cab7e2387c0aa01e026e6a721964 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3870,6 +3870,7 @@ sub add_media
 
     my $cmd;
     if ($arg->{nb} > 0) {
+       $arg->{offset} = $arg->{offset}?$arg->{offset}:1; 
        $cmd = "add pool=\"$arg->{pool}\" storage=\"$arg->{storage}\"\n$arg->{nb}\n$arg->{media}\n$arg->{offset}\n";
     } else {
        $cmd = "add pool=\"$arg->{pool}\" storage=\"$arg->{storage}\"\n0\n$arg->{media}\n";
@@ -4113,7 +4114,20 @@ sub run_job_mod
     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 $arg = $self->get_form(qw/pool level client fileset storage media/);
+    
+    if (!$arg->{pool} and $arg->{media}) {
+       my $r = $self->dbh_selectrow_hashref("
+SELECT Pool.Name AS name
+  FROM Media JOIN Pool USING (PoolId)
+ WHERE Media.VolumeName = '$arg->{media}'
+   AND Pool.Name != 'Scratch'
+");
+       if ($r) {
+           $arg->{pool} = $r->{name};
+       }
+    }
+
     my %job_opt = (%$attr, %$arg);
     
     my $jobs   = [ map {{ name => $_ }} $b->list_job() ];

diff --git a/gui/bweb/tpl/add_media.tpl b/gui/bweb/tpl/add_media.tpl
index 492c5d48876d0c5b3a4a26ad5ac726422679f92d..3c455f22425d9e5a57ccae70689ee28d7accf026 100644 (file)
--- a/gui/bweb/tpl/add_media.tpl
+++ b/gui/bweb/tpl/add_media.tpl
@@ -27,13 +27,13 @@
          <td><input size='3' type='text' name='nb' value='1' class='formulaire'></td>
      </tr>
      <tr><td>Starting number :</td> 
-         <td><input size='3' type='text' name='offset' class='formulaire' value='0'></td>
+         <td><input size='3' type='text' name='offset' class='formulaire' value='1'></td>
      </tr>
      <tr><td>Name :</td> 
          <td><input size='8' type='text' name='media' class='formulaire' value='Vol'></td>
      </tr>
     </table>
-    <button type="submit" class="bp" name='action' value='add_media'
+    <button type="submit" class="bp" name='action' value='add_media'>
      <img src='/bweb/add.png' alt=''>Add<button>
    </form>
 </div>

diff --git a/gui/bweb/tpl/scheduled_job.tpl b/gui/bweb/tpl/scheduled_job.tpl
index a316ceaa4de7cc2dd4d4ddaf0d13e881a36d71c0..c944fec91f45a6ba2c172463d25cf264f2e2e046 100644 (file)
--- a/gui/bweb/tpl/scheduled_job.tpl
+++ b/gui/bweb/tpl/scheduled_job.tpl
@@ -11,6 +11,7 @@
        <img src='/bweb/inflag0.png' alt=''> Disable </button>
      <input type='hidden' name='pool' value=''>
      <input type='hidden' name='level' value=''>
+     <input type='hidden' name='media' value=''>
     </form>
  </div>
 
@@ -35,6 +36,7 @@ chkbox.value = '<TMPL_VAR name>';
 chkbox.onclick = function() { 
  document.form1.level.value = '<TMPL_VAR level>';
  document.form1.pool.value = '<TMPL_VAR pool>';
+ document.form1.media.value = '<TMPL_VAR volume>';
 } ;
 
 data.push( new Array(