ebl Fix multiple media prune/purge

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

diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm
index a264ada3fd29232b8be25de8a1373f9a4e266ec8..45ec5d4183c0ce8c5952a92985d0ad2643c7aea0 100644 (file)
--- a/gui/bweb/lib/Bconsole.pm
+++ b/gui/bweb/lib/Bconsole.pm
@@ -370,9 +370,9 @@ sub _get_volume
 
 sub purge_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("purge $sel");
@@ -384,9 +384,9 @@ sub purge_volume
 
 sub prune_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("prune $sel yes");

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index b52f9fd3cd17f72fb7dfdd75aadc77cfc02d0c9e..d8c275ec44f66dd94b0bce46747fc1d5e9e9b52d 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3414,11 +3414,13 @@ sub purge
 
     my $b = new Bconsole(pref => $self->{info}, timeout => 60);
 
-    $self->display({
-       content => $b->purge_volume(@volume),
-       title => "Purge media",
-       name => "purge volume=" . join(' volume=', @volume),
-    }, "command.tpl"); 
+    foreach my $v (@volume) {
+       $self->display({
+           content => $b->purge_volume($v),
+           title => "Purge media",
+           name => "purge volume=$v",
+       }, "command.tpl");
+    }  
     $b->close();
 }
 
@@ -3435,12 +3437,11 @@ sub prune
 
     foreach my $v (@volume) {
        $self->display({
-           content => $b->prune_volume(@volume),
+           content => $b->prune_volume($v),
            title => "Prune volume",
            name => "prune volume=$v",
        }, "command.tpl");
     }
-
     $b->close();
 }