From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 15 Apr 2011 11:51:49 +0000 (+0200)
Subject: bweb: Fix recyclepool problem reported by Magnus Kulk
X-Git-Tag: Release-5.2.1~475
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68f3a84db66e3715ebae3a4aa4501460a46bd7fc;p=bacula%2Fbacula

bweb: Fix recyclepool problem reported by Magnus Kulk
---

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 174d3e434b..b938c19fc7 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1863,6 +1863,8 @@ sub get_form
                  new_dir => 1,
                  job     => 1,
                  storage => 1,
+                 pool   => 1,
+                 poolrecycle => 1,
                  );
     my %opt_s = (               # default to ''
                  ach    => 1,
@@ -1871,14 +1873,12 @@ sub get_form
                  inchanger => 1,
                  client => 1,
                  level  => 1,
-                 pool   => 1,
                  media  => 1,
                  ach    => 1,
                  jobtype=> 1,
                  graph  => 1,
                  gtype  => 1,
                  type   => 1,
-                 poolrecycle => 1,
                  replace => 1,
                  expired => 1,
                  enabled => 1,
@@ -4569,7 +4569,9 @@ sub do_update_media
 
     if (defined $arg->{poolrecycle}) {
         $update .= " recyclepool=\"$arg->{poolrecycle}\" " ;
-    }        
+    } else {
+        $update .= " recyclepool= " ;
+    }
     
     my $b = $self->get_bconsole();
 
diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index d2706673ad..63ad4356ff 100644
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -97,6 +97,7 @@
     </tr>
     <tr><td>__Recycle Pool:__</td>
         <td><select name='poolrecycle' class='formulaire'>
+             <option value='' title='*__None__*'></option>
 <TMPL_LOOP db_pools>
              <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>