ebl Add RecyclePool to Media Update

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

diff --git a/gui/bweb/lang/fr/tpl/stats.tpl b/gui/bweb/lang/fr/tpl/stats.tpl
index 12c3c71da65e77c83173651f5d497405dfd5ccda..bf4301d709e18d1945e320aa53a28debae311726 100644 (file)
--- a/gui/bweb/lang/fr/tpl/stats.tpl
+++ b/gui/bweb/lang/fr/tpl/stats.tpl
@@ -3,7 +3,7 @@
 </div>
 <div class='bodydiv'>
 <a href='?action=job;age=172800;jobtype=B'>
-<img src='bgraph.pl?age=2678400;width=600;height=250;graph=job_sum_day;limit=500;action=graph;legend=off' alt='Rien a afficher'>
+<img src='bgraph.pl?age=2678400;width=450;height=200;graph=job_sum_day;limit=500;action=graph;legend=off' alt='Rien a afficher'>
 </a>
 </div>
 

diff --git a/gui/bweb/lang/fr/tpl/update_media.tpl b/gui/bweb/lang/fr/tpl/update_media.tpl
index 118bd8efadca28590988ec96642629a2e0f06f15..6fb09ac91a30e0c9bb128b2644f0d5cdbff37166 100644 (file)
--- a/gui/bweb/lang/fr/tpl/update_media.tpl
+++ b/gui/bweb/lang/fr/tpl/update_media.tpl
@@ -86,7 +86,7 @@
         </td>
     </tr>
     <tr><td>Pool de recyclage :</td>
-        <td><select name='recyclepool' class='formulaire'>
+        <td><select name='poolrecycle' class='formulaire'>
 <TMPL_LOOP db_pools>
              <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
@@ -131,7 +131,13 @@ for (var i=0; ok && i < document.form1.pool.length; ++i) {
       ok=0;
    }
 }
-
+ok=1;
+for (var i=0; ok && i < document.form1.poolrecycle.length; ++i) {
+   if (document.form1.poolrecycle[i].value == '<TMPL_VAR poolrecycle>') {
+      document.form1.poolrecycle[i].selected = true;
+      ok=0;
+   }
+}
 ok=1;
 for (var i=0; ok && i < document.form1.location.length; ++i) {
    if (document.form1.location[i].value == '<TMPL_VAR location>') {

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index fc70854e55acb1306cc037d3b5c429589025f97c..5cbdc48a50d1e5da7e0f6065a8af90b48fc3edc5 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1352,7 +1352,7 @@ sub get_form
                 graph  => 1,
                  gtype  => 1,
                  type   => 1,
-                recyclepool => 1,
+                poolrecycle => 1,
                 );
     my %opt_p = (              # option with path
                 fileset=> 1,
@@ -2291,7 +2291,7 @@ sub update_media
 
     my $query = "
 SELECT Media.Slot         AS slot,
-       Pool.Name          AS poolname,
+       PoolMedia.Name     AS poolname,
        Media.VolStatus    AS volstatus,
        Media.InChanger    AS inchanger,
        Location.Location  AS location,
@@ -2302,9 +2302,10 @@ SELECT Media.Slot         AS slot,
        Media.VolUseDuration AS voluseduration,
        Media.VolRetention AS volretention,
        Media.Comment      AS comment,
-       Media.RecyclePoolId AS recyclepoolid
+       PoolRecycle.Name   AS poolrecycle
 
-FROM Media INNER JOIN Pool ON (Media.PoolId = Pool.PoolId)
+FROM Media INNER JOIN Pool AS PoolMedia ON (Media.PoolId = PoolMedia.PoolId)
+           LEFT  JOIN Pool AS PoolRecycle ON (Media.RecyclePoolId = PoolRecycle.PoolId)
            LEFT  JOIN Location ON (Media.LocationId = Location.LocationId)
 
 WHERE Media.VolumeName = $media->{qmedia}
@@ -2785,7 +2786,7 @@ sub do_update_media
     my $arg = $self->get_form(qw/media volstatus inchanger pool
                                 slot volretention voluseduration 
                                 maxvoljobs maxvolfiles maxvolbytes
-                                qcomment recyclepool
+                                qcomment poolrecycle
                              /);
 
     unless ($arg->{media}) {
@@ -2853,8 +2854,8 @@ 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->{recyclepool}) {
-       push @q, "RecyclePoolId=(SELECT PoolId FROM Pool WHERE Name='$arg->{recyclepool}')";
+    if ($arg->{poolrecycle}) {
+       push @q, "RecyclePoolId=(SELECT PoolId FROM Pool WHERE Name='$arg->{poolrecycle}')";
     }
     if (!$arg->{qcomment}) {
        $arg->{qcomment} = "''";

diff --git a/gui/bweb/tpl/stats.tpl b/gui/bweb/tpl/stats.tpl
index 6d5c771ff9f39d0e6faf2d835767064bbd2e10fc..a70a07fac93db7dc4a6b5d02bc163b1ef99ccdbf 100644 (file)
--- a/gui/bweb/tpl/stats.tpl
+++ b/gui/bweb/tpl/stats.tpl
@@ -3,7 +3,7 @@
 </div>
 <div class='bodydiv'>
 <a href='?action=job;age=172800;jobtype=B'>
-<img src='bgraph.pl?age=2678400;width=600;height=250;graph=job_sum_day;limit=500;action=graph;legend=off' alt='Nothing to display'>
+<img src='bgraph.pl?age=2678400;width=450;height=200;graph=job_sum_day;limit=500;action=graph;legend=off' alt='Nothing to display'>
 </a>
 </div>
 

diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index b0578ce9d70d71609953642939fb846044c14db1..150842a7d876ec98ed5d7a46861434c1f6e6887e 100644 (file)
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -86,7 +86,7 @@
         </td>
     </tr>
     <tr><td>Recycle Pool:</td>
-        <td><select name='recyclepool' class='formulaire'>
+        <td><select name='poolrecycle' class='formulaire'>
 <TMPL_LOOP db_pools>
              <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
@@ -133,6 +133,14 @@ for (var i=0; ok && i < document.form1.pool.length; ++i) {
    }
 }
 
+ok=1;
+for (var i=0; ok && i < document.form1.pool.length; ++i) {
+   if (document.form1.poolrecycle[i].value == '<TMPL_VAR poolrecycle>') {
+      document.form1.poolrecycle[i].selected = true;
+      ok=0;
+   }
+}
+
 ok=1;
 for (var i=0; ok && i < document.form1.location.length; ++i) {
    if (document.form1.location[i].value == '<TMPL_VAR location>') {