ebl add media filter on display_media

ebl  add media view on job zoom

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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index c14fed016a12ed9bab2201617baa494c53f95088..8cbf085f3f25bf538c82dfc7836555ff5cdea04c 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1888,6 +1888,12 @@ sub display_media
     my ($where, %elt) = $self->get_param('pool',
                                         'location');
 
+    my $arg = $self->get_form('jmedias');
+
+    if ($arg->{jmedias}) {
+       $where = "AND Media.VolumeName IN ($arg->{jmedias}) $where"; 
+    }
+
     my $query="
 SELECT Media.VolumeName AS volumename, 
        Media.VolBytes   AS volbytes,
@@ -2244,14 +2250,13 @@ sub save_location
 {
     my ($self) = @_ ;
 
-    my $medias = $self->get_selected_media();
+    my $arg = $self->get_form('jmedias', 'qnewlocation') ;
 
-    unless ($medias) {
-       return 0;
+    unless ($arg->{jmedias}) {
+       return $self->error("Can't get selected media");
     }
     
-    my $loc = $self->get_form('qnewlocation');
-    unless ($loc->{qnewlocation}) {
+    unless ($arg->{qnewlocation}) {
        return $self->error("Can't get new location");
     }
 
@@ -2259,8 +2264,8 @@ sub save_location
  UPDATE Media 
      SET LocationId = (SELECT LocationId 
                        FROM Location 
-                       WHERE Location = $loc->{qnewlocation}) 
-     WHERE Media.VolumeName IN ($medias)
+                       WHERE Location = $arg->{qnewlocation}) 
+     WHERE Media.VolumeName IN ($arg->{jmedias})
 ";
 
     my $nb = $self->dbh_do($query);

diff --git a/gui/bweb/tpl/begin.tpl b/gui/bweb/tpl/begin.tpl
index da3f7744a6878ec64fecd1021f5eb0084b9f3d67..32b46d5ff5e77331ceeae703bdae2915993c8e91 100644 (file)
--- a/gui/bweb/tpl/begin.tpl
+++ b/gui/bweb/tpl/begin.tpl
@@ -15,8 +15,8 @@
 <a href="?action=client"> Clients </a>|              
 <a href="?action=run_job"> Jobs </a>|
 <a href="?action=running"> Running jobs </a>|
+<a href="?action=job"> Old Job </a>|
 <a href="?action=next_job"> Next jobs </a|>|
-<a href="?action=job"> Job list </a>|
 <a href="?action=restore"> Restore </a>|
 <a href="?action=graph"> Statistics </a>] [
 <a href="?action=pool"> Pools </a>|

diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index 2e298e16f6698657507a98ed9bde11e1132b10e7..1b51129ac7c9461f903994b53a7880d02004c882 100644 (file)
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -3,12 +3,34 @@
  </div>
  <div class="bodydiv">
  <table id='id0'></table>
+ <table><td>
  <form action='?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <button class='formulaire' name='action' value='delete' title='delete this job'>
+  <button class='formulaire' name='action' value='delete' title='delete this job'>   Delete<br/>
      <img src='/bweb/purge.png'>
   </button>
  </form>
+ </td><td>
+ <form action='?'>
+  <TMPL_LOOP volumes>
+   <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
+  </TMPL_LOOP>   
+  <button class='formulaire' name='action' value='media' title='view media'>
+     View media<br/>
+     <img src='/bweb/zoom.png'>
+  </button>
+ </form>
+ </td>
+ <td>
+ <form action='?'>
+  <input type='hidden' name='client' value='<TMPL_VAR Client>'>
+  <button class='formulaire' name='action' value='job' title='view jobs of <TMPL_VAR Client>'>
+     View jobs<br/>
+     <img src='/bweb/zoom.png'>
+  </button>
+ </form>
+ </td>
+ </table>
 </div>
 
 <script language='JavaScript'>

diff --git a/gui/bweb/tpl/display_media.tpl b/gui/bweb/tpl/display_media.tpl
index aa5d4118aa4b22ac52e3e7722150ffc437b8eaf0..c99db5febd73bad4709698cc8d19eb926a7a443d 100644 (file)
--- a/gui/bweb/tpl/display_media.tpl
+++ b/gui/bweb/tpl/display_media.tpl
@@ -21,8 +21,8 @@ Location : <TMPL_VAR location>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <button class='formulaire' type='submit' name='action' value='extern'><img src='/bweb/extern.png'></button>
-      <button class='formulaire' type='submit' name='action' value='intern'><img src='/bweb/intern.png'></button> 
+      <button class='formulaire' type='submit' name='action' value='extern' title='Move out'><img src='/bweb/extern.png'></button>
+      <button class='formulaire' type='submit' name='action' value='intern' title='Move in'><img src='/bweb/intern.png'></button> 
       <button class='formulaire' type='submit' name='action' value='update_media' title='Update media'><img src='/bweb/edit.png'></button> 
       <button class='formulaire' type='submit' name='action' value='media_zoom' title='Informations'><img src='/bweb/zoom.png'></button>
 <!--

diff --git a/gui/bweb/tpl/display_media_zoom.tpl b/gui/bweb/tpl/display_media_zoom.tpl
index bc24ba1472b2c8d5b0c27525bb6c1c2ca98b2ebf..c8cba4d4a80f3197467ad7ff6825611f53d123f9 100644 (file)
--- a/gui/bweb/tpl/display_media_zoom.tpl
+++ b/gui/bweb/tpl/display_media_zoom.tpl
@@ -11,9 +11,9 @@
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>
-      <button class='formulaire' type='submit' name='action' value='intern'><img src='/bweb/intern.png'></button> 
+      <button class='formulaire' type='submit' name='action' value='extern' title='move out'><img src='/bweb/extern.png'></button>      
 <TMPL_ELSE>
-      <button class='formulaire' type='submit' name='action' value='extern'><img src='/bweb/extern.png'></button>
+      <button class='formulaire' type='submit' name='action' value='intern' title='move in'><img src='/bweb/intern.png'></button> 
 </TMPL_IF>
       <button class='formulaire' type='submit' name='action' value='update_media' title='Update'><img src='/bweb/edit.png'></button> 
       <button class='formulaire' type='submit' name='action' value='purge' title='Purge'><img src='/bweb/purge.png'></button>

diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index 7038f095f2a20a2a7eee2514b817ed424c0baf30..fa1dd3285844e6165cf5fc960082b8325ed5df08 100644 (file)
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -86,18 +86,26 @@
         </td>
     </tr>
     </table>
-<button class='formulaire' name='action' value='do_update_media'>Apply<br/>
- <img src='/bweb/apply.png'>
-</button>
-<button class='formulaire' name='action' title='Update from pool'
-  value='update_from_pool'>Update<br/>
- <img src='/bweb/update.png' title='Update from pool'>
-</button>
-<button class='formulaire' name='action' value='media'>View Pool<br/>
- <img src='/bweb/zoom.png'>
-</button>
-
-   </form>
+<table>
+ <td>
+  <button class='formulaire' name='action' value='do_update_media'>Apply<br/>
+   <img src='/bweb/apply.png'>
+  </button>
+  <button class='formulaire' name='action' title='Update from pool'
+    value='update_from_pool'>Update<br/>
+   <img src='/bweb/update.png' title='Update from pool'>
+  </button>
+ </form>
+ </td>
+ <td>
+  <form action='?' method='GET'>
+   <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
+    <button class='formulaire' name='action' value='media'>View Pool<br/>
+     <img src='/bweb/zoom.png'>
+    </button>
+  </form>
+ </td>
+</table>
 </div>
 
 <script language='JavaScript'>