ebl Get a working example

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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 0eec8358c494008818a4fb4dc860da3805f15c93..80d03e78628aae5c19d7f479ec5d36cacf9bec3e 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -4535,19 +4535,26 @@ sub display_next_job
        return $self->error("Can't get $arg->{job} schedule");
     }
     my $jsched = $1;
+    my $jpool='';
+    if ($job =~ /Pool: name=([\w\d\-]+) PoolType=/) {
+       $jpool = $1;
+    }
 
     my $out = $b->send_cmd("show schedule=\"$jsched\"");
     my $sched = new Bweb::Sched();
     $sched->parse_scheds(split(/\r?\n/, $out));
 
     my $ss = $sched->get_scheds($jsched); 
+    my @ret;
 
     foreach my $s (@$ss) {
        my $level = $sched->get_level($s);
-       my $pool  = $sched->get_pool($s);
+       my $pool  = $sched->get_pool($s) || $jpool;
        my $evt = $sched->get_event($s);
-       print "$level on $pool <pre>", Data::Dumper::Dumper($evt), "</pre><br>";
+       push @ret, map { "$_ : $pool ($level)\n" } @$evt;
     }
+    
+    print "<b>$arg->{job}:</b><pre>", sort @ret, "</pre><br>";
 }
 
 1;

diff --git a/gui/bweb/tpl/run_job.tpl b/gui/bweb/tpl/run_job.tpl
index 9f333617a54a0db9c7cdf304a76042a844bd4cd7..0f7893d15135fceda74da6f0f5cfb05da1f3d36f 100644 (file)
--- a/gui/bweb/tpl/run_job.tpl
+++ b/gui/bweb/tpl/run_job.tpl
@@ -19,6 +19,7 @@
    <br/>
    <button type="submit" class="bp" name='action' value='enable_job' title='Enable'> <img src='/bweb/inflag1.png' alt=''> Enable </button>
    <button type="submit" class="bp" name='action' value='disable_job' title='Disable' > <img src='/bweb/inflag0.png' alt=''> Disable </button>
+   <button type="submit" class="bp" name='action' value='next_job2' title='Show schedule' > <img src='/bweb/zoom.png' alt=''> Show schedule  </button>
    <button type="submit" class="bp" name='action' value='run_job_mod' title='Run now' > <img src='/bweb/R.png' alt=''> Run now  </button>
   </form>
  </div>