ebl use update recyclepool= instead of SQL query

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

diff --git a/gui/bweb/INSTALL b/gui/bweb/INSTALL
index 7f1b53bd5faf0240641ee7f95d662d41a7c47b29..620ee32c4be6e07fd78054978f0c5feaf5f11009 100644 (file)
--- a/gui/bweb/INSTALL
+++ b/gui/bweb/INSTALL
@@ -304,8 +304,6 @@ GRANT INSERT,UPDATE,DELETE ON bacula.Location
   TO 'bweb'@'%' IDENTIFIED BY 'password';
 GRANT INSERT,UPDATE,DELETE ON bacula.LocationLog 
   TO 'bweb'@'%' IDENTIFIED BY 'password';
-GRANT UPDATE (LocationId,Comment,RecyclePoolId) ON bacula.Media 
-  TO 'bweb'@'%'  IDENTIFIED BY 'password';
 
 ################ GET MORE STATISTICS ###########################
 

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index 92d1dc8fe41a3d944c7974394183075c7e132b8c..a4c3f51ee111c32661cc2b31f49ad0fcfb32799e 100644 (file)
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -2,6 +2,7 @@
 
 2007/08/20
  - fix update of locationid field during label barcodes 
+ - use update recyclepool= instead of UPDATE Media SET RecyclePoolId
 
 2007/08/11
  - update install_bweb

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 5f3c07ba13f7ff162228fa4d9eab832589f038ee..e73ae947513471f5c9414408a49a0780def642cc 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3217,6 +3217,10 @@ sub do_update_media
        $update .= " maxvolbytes=$arg->{maxvolbytes} " ;
     }    
 
+    if (defined $arg->{poolrecycle}) {
+       $update .= " recyclepool=\"$arg->{poolrecycle}\" " ;
+    }        
+    
     my $b = $self->get_bconsole();
 
     $self->display({
@@ -3234,9 +3238,6 @@ sub do_update_media
        $loc = $self->dbh_quote($loc); # is checked by db
        push @q, "LocationId=(SELECT LocationId FROM Location WHERE Location=$loc)";
     }
-    if ($arg->{poolrecycle}) {
-       push @q, "RecyclePoolId=(SELECT PoolId FROM Pool WHERE Name='$arg->{poolrecycle}')";
-    }
     if (!$arg->{qcomment}) {
        $arg->{qcomment} = "''";
     }

diff --git a/gui/debian/changelog b/gui/debian/changelog
index 31ba579de6dbda7797bb975f2561739fb66693e9..b9f2dffcdb6b8a17a9717cf8acd6c6836f903216 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,5 +1,9 @@
 bweb (2.2.0-2) stable; urgency=low
-
+  
+  * WARNING: 2.2.0-2 version don't support bacula 2.0.X anymore
+  * cleanup brestore
+  * update brestore_xxx only when job is in (T, f, A)
+  * use update recyclepool= instead of SQL query 
   * fix Media.LocationId update during label barcodes 
 
  -- Eric Bollengier <eric@eb.homelinux.org>  Mon,  20 Aug 2007 15:15:47 +0000