ebl add comment and recyclepool

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

diff --git a/gui/bweb/lang/fr/tpl/update_media.tpl b/gui/bweb/lang/fr/tpl/update_media.tpl
index 7bf1e1e74fabe57ec1b7c07db365c3d39eebacc3..118bd8efadca28590988ec96642629a2e0f06f15 100644 (file)
--- a/gui/bweb/lang/fr/tpl/update_media.tpl
+++ b/gui/bweb/lang/fr/tpl/update_media.tpl
@@ -85,6 +85,20 @@
                name='maxvolbytes' value='<TMPL_VAR maxvolbytes>'>
         </td>
     </tr>
+    <tr><td>Pool de recyclage :</td>
+        <td><select name='recyclepool' class='formulaire'>
+<TMPL_LOOP db_pools>
+             <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
+</TMPL_LOOP>
+           </select>
+        </td>
+    </tr>
+    <tr><td> Commentaire : </td>
+        <td>
+          <input class='formulaire' type='text' title='un commentaire'
+               name='comment' value='<TMPL_VAR comment>'>
+        </td>
+    </tr>
     </table>
 <table>
  <td>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 41a5ddfa3868207c0ccf152993b881bef9b62de8..de6e1a2d8dbdcdd6bf6548baa12922549b43b29e 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1352,6 +1352,7 @@ sub get_form
                 graph  => 1,
                  gtype  => 1,
                  type   => 1,
+                recyclepool => 1,
                 );
     my %opt_p = (              # option with path
                 fileset=> 1,
@@ -2299,7 +2300,9 @@ SELECT Media.Slot         AS slot,
        Media.MaxVolJobs   AS maxvoljobs,
        Media.MaxVolFiles  AS maxvolfiles,
        Media.VolUseDuration AS voluseduration,
-       Media.VolRetention AS volretention
+       Media.VolRetention AS volretention,
+       Media.Comment      AS comment,
+       Media.RecyclePoolId AS recyclepoolid
 
 FROM Media INNER JOIN Pool ON (Media.PoolId = Pool.PoolId)
            LEFT  JOIN Location ON (Media.LocationId = Location.LocationId)
@@ -2782,6 +2785,7 @@ sub do_update_media
     my $arg = $self->get_form(qw/media volstatus inchanger pool
                                 slot volretention voluseduration 
                                 maxvoljobs maxvolfiles maxvolbytes
+                                qcomment recyclepool
                              /);
 
     unless ($arg->{media}) {
@@ -2841,17 +2845,26 @@ sub do_update_media
     }, "command.tpl"); 
 
 
+    my @q;
+    my $media = $self->dbh_quote($arg->{media});
+
     my $loc = CGI::param('location') || '';
     if ($loc) {
-       my $media = $self->dbh_quote($arg->{media});
        $loc = $self->dbh_quote($loc); # is checked by db
-       my $query = "
+       push @q, "LocationId=(SELECT LocationId FROM Location WHERE Location=$loc)";
+    }
+    if ($arg->{recyclepool}) {
+       push @q, "RecyclePoolId=(SELECT PoolId FROM Pool WHERE Name='$arg->{recyclepool}')";
+    }
+    push @q, "Comment=$arg->{qcomment}";
+    
+
+    my $query = "
 UPDATE Media 
-   SET LocationId=(SELECT LocationId FROM Location WHERE Location=$loc)
+   SET " . join (',', @q) . "
  WHERE Media.VolumeName = $media
 ";
-       $self->dbh_do($query);
-    }
+    $self->dbh_do($query);
 
     $self->update_media();
 }

diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index a7e16df7531c312e5a3219b8f7be7b1b7a94293a..b0578ce9d70d71609953642939fb846044c14db1 100644 (file)
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -85,6 +85,21 @@
                name='maxvolbytes' value='<TMPL_VAR maxvolbytes>'>
         </td>
     </tr>
+    <tr><td>Recycle Pool:</td>
+        <td><select name='recyclepool' class='formulaire'>
+<TMPL_LOOP db_pools>
+             <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
+</TMPL_LOOP>
+           </select>
+        </td>
+    </tr>
+    <tr><td> Comment: </td>
+        <td>
+          <input class='formulaire' type='text' title='a comment'
+               name='comment' value='<TMPL_VAR comment>'>
+        </td>
+    </tr>
+
     </table>
 <table>
  <td>