From 4e211e728a1036d60aad4ce962f5542ccacde45b Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 30 Oct 2007 20:15:09 +0000
Subject: [PATCH] ebl  Add Enabled option to update_media, extern/intern     
 Fix typo

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5820 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/cgi/bweb.pl                         |  11 +-
 gui/bweb/html/bresto.html                    |   6 +
 gui/bweb/html/bresto.js                      | 120 ++++++++++++++++++-
 gui/bweb/html/bweb.js                        |  16 +++
 gui/bweb/lang/es/tpl/change_location.tpl     |   2 +-
 gui/bweb/lang/es/tpl/display_media.tpl       |   2 +-
 gui/bweb/lang/es/tpl/display_media_zoom.tpl  |   3 +-
 gui/bweb/lang/es/tpl/help_extern_compute.tpl |   2 +-
 gui/bweb/lang/es/tpl/help_intern_compute.tpl |   3 +-
 gui/bweb/lang/es/tpl/move_media.tpl          |  31 ++---
 gui/bweb/lang/es/tpl/update_location.tpl     |   2 +-
 gui/bweb/lang/es/tpl/update_media.tpl        |  16 +++
 gui/bweb/lang/fr/tpl/change_location.tpl     |   2 +-
 gui/bweb/lang/fr/tpl/display_media.tpl       |   2 +-
 gui/bweb/lang/fr/tpl/display_media_zoom.tpl  |   3 +-
 gui/bweb/lang/fr/tpl/help_extern_compute.tpl |   2 +-
 gui/bweb/lang/fr/tpl/help_intern_compute.tpl |   3 +-
 gui/bweb/lang/fr/tpl/move_media.tpl          |  32 ++---
 gui/bweb/lang/fr/tpl/update_location.tpl     |   2 +-
 gui/bweb/lang/fr/tpl/update_media.tpl        |  16 +++
 gui/bweb/lib/Bweb.pm                         | 102 ++++++++++------
 gui/bweb/tpl/change_location.tpl             |   2 +-
 gui/bweb/tpl/display_media.tpl               |   2 +-
 gui/bweb/tpl/display_media_zoom.tpl          |   3 +-
 gui/bweb/tpl/help_extern_compute.tpl         |   2 +-
 gui/bweb/tpl/help_intern_compute.tpl         |   3 +-
 gui/bweb/tpl/move_media.tpl                  |  31 ++---
 gui/bweb/tpl/update_location.tpl             |   2 +-
 gui/bweb/tpl/update_media.tpl                |  16 +++
 29 files changed, 331 insertions(+), 108 deletions(-)

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index 4dd5fbbd2e..3b40b7aee5 100755
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -122,8 +122,8 @@ if ($action eq 'begin') {		# main display
 			 limit => $arg->{limit});
     print "</td></tr></table></div>";
 
-} elsif ($action eq 'medias') {
-    $bweb->display_medias();
+} elsif ($action eq 'allmedia') {
+    $bweb->display_allmedia();
 
 } elsif ($action eq 'eject') {
     my $arg = $bweb->get_form("ach");
@@ -228,7 +228,7 @@ if ($action eq 'begin') {		# main display
 	$bweb->update_slots();
     }
     print "</div><div style='float: left;margin-left: 20px;'>";
-    $bweb->move_media();
+    $bweb->move_media('no');	# enabled = no
     print "</div>";
 
 } elsif ($action eq 'move_email') {
@@ -244,10 +244,11 @@ if ($action eq 'begin') {		# main display
     $bweb->display($bweb, 'about.tpl');
 
 } elsif ($action eq 'intern') {
-    $bweb->move_media(); # TODO : remove that
+    $bweb->move_media('yes'); # TODO : remove that
 
 } elsif ($action eq 'move_media') {
-    $bweb->move_media(); 
+    my $a = $bweb->get_form('enabled');
+    $bweb->move_media($a->{enabled}); 
 
 } elsif ($action eq 'save_location') {
     $bweb->save_location();
diff --git a/gui/bweb/html/bresto.html b/gui/bweb/html/bresto.html
index 5a5a7b2d7e..ecc139b6f6 100644
--- a/gui/bweb/html/bresto.html
+++ b/gui/bweb/html/bresto.html
@@ -24,5 +24,11 @@
     <div id="div-file-selection" ></div>
     <div id="div-tree"           ></div>
 </div>		
+
+<div id="div-resto-dlg" style="visibility:hidden;">
+<div id="div-resto-form" >
+<div id="div-resto-form-bp1"></div> <div id="div-resto-form-bp2"></div> 
+</div>
+</div>
 	</body>
 </html>
diff --git a/gui/bweb/html/bresto.js b/gui/bweb/html/bresto.js
index eecf8d93c9..559850076c 100644
--- a/gui/bweb/html/bresto.js
+++ b/gui/bweb/html/bresto.js
@@ -291,7 +291,6 @@ function ext_init()
         copy:false,
         notifyDrop : function(dd, e, data){
            var r;
-           //TODO: gerer la multi-selection
            if (data.selections) {
              if (data.grid.id == 'div-files') {
                  for(var i=0;i<data.selections.length;i++) {
@@ -500,7 +499,6 @@ function ext_init()
     });
 
     job_combo.on('select', function(e,c) {
-        // TODO: choose between date and jobid here (with a toolbar bp ?)
         Ext.brestore.jobid = c.json[0];
 	Ext.brestore.jobdate = c.json[1];
         Ext.brestore.root_path='';
@@ -601,7 +599,123 @@ function ext_init()
             cls: 'x-btn-text-icon bmenu', // icon and text class
             text:'Options',
             menu: menu  // assign menu by instance
-        }
+        },
+	{
+	    icon: '/bweb/remove.png', // icons can also be specified inline
+            cls: 'x-btn-icon',
+	    text: 'restore',
+	    handler: function() { 
+		var dialog = new Ext.LayoutDialog("div-resto-dlg", { 
+//                        modal:true,
+                        width:600,
+                        height:400,
+                        shadow:true,
+                        minWidth:300,
+                        minHeight:300,
+                        proxyDrag: true,
+//                        west: {
+//	                        split:true,
+//	                        initialSize: 150,
+//	                        minSize: 100,
+//	                        maxSize: 250,
+//	                        titlebar: true,
+//	                        collapsible: true,
+//	                        animate: true
+//	                    },
+	                center: {
+	                        autoScroll:true,
+//	                        tabPosition: 'top',
+//	                        closeOnTab: true,
+//	                        alwaysShowTabs: true
+	                }
+                });
+                dialog.addKeyListener(27, dialog.hide, dialog);
+                dialog.addButton('Submit', dialog.hide, dialog);
+                dialog.addButton('Close', dialog.hide, dialog);
+
+    var fs = new Ext.form.Form({
+        labelAlign: 'right',
+        labelWidth: 80
+    });
+
+    fs.fieldset(
+        {legend:'Restore job'},
+        new Ext.form.ComboBox({
+            fieldLabel: 'Replace',
+            hiddenName:'replace',
+            store: new Ext.data.SimpleStore({
+   		 fields: ['replace'],
+		 data : [['always'],['never'],['if newer']]
+	    }),
+            displayField:'replace',
+            typeAhead: true,
+            mode: 'local',
+            triggerAction: 'all',
+            emptyText:'never',
+            selectOnFocus:true,
+            width:190
+        }),
+
+        new Ext.form.ComboBox({
+            fieldLabel: 'job',
+            hiddenName:'job',
+            store: client_store,
+            displayField:'name',
+            typeAhead: true,
+            mode: 'local',
+            triggerAction: 'all',
+            emptyText:'Select a job...',
+            selectOnFocus:true,
+            width:190
+        })
+//	,
+//        new Ext.form.TextField({
+//            fieldLabel: 'Where',
+//            name: 'where',
+//            width:190
+//        }),
+//
+//        new Ext.form.ComboBox({
+//            fieldLabel: 'client',
+//            hiddenName:'client',
+//            store: client_store,
+//            displayField:'name',
+//            typeAhead: true,
+//            mode: 'local',
+//            triggerAction: 'all',
+//            emptyText:'Select a client...',
+//            selectOnFocus:true,
+//            width:190
+//        }),
+//        new Ext.form.ComboBox({
+//            fieldLabel: 'storage',
+//            hiddenName:'storage',
+//            store: client_store,
+//            displayField:'name',
+//            typeAhead: true,
+//            mode: 'local',
+//            triggerAction: 'all',
+//            emptyText:'Select a storage...',
+//            selectOnFocus:true,
+//            width:190
+//        })
+    );
+
+    fs.render('div-resto-form');
+
+//      var f = new Ext.form.BasicForm('div-resto-form', {url: '/bweb/test', method: 'GET',
+//	                                                baseParams: {init: 1}
+// 						       }
+//                                     );
+
+		var layout = dialog.getLayout();
+                layout.beginUpdate();
+	        layout.add('center', new Ext.ContentPanel('div-resto-form', {
+                                    autoCreate:true, title: 'Third Tab', closable:true, background:true}));
+	        layout.endUpdate();
+	        dialog.show();
+	    }
+	}
     ]);
 
 ////////////////////////////////////////////////////////////////
diff --git a/gui/bweb/html/bweb.js b/gui/bweb/html/bweb.js
index 92de08f95b..1f8ae07562 100644
--- a/gui/bweb/html/bweb.js
+++ b/gui/bweb/html/bweb.js
@@ -106,6 +106,22 @@ function human_size(val)
    return val.toFixed(format) + ' ' + unit[i];
 }
 
+function human_enabled(val)
+{   
+   if (!val) {
+      return 'no';
+   }
+
+   if (val == 'yes' || val == '1') {
+      return 'yes';
+
+   } else if (val == 'archived' || val == '2') {
+      return 'archived';
+   } else {
+      return 'no';
+   }
+}
+
 function human_sec(val)
 {
    if (!val) {
diff --git a/gui/bweb/lang/es/tpl/change_location.tpl b/gui/bweb/lang/es/tpl/change_location.tpl
index 496c61ab06..58d3ae2659 100644
--- a/gui/bweb/lang/es/tpl/change_location.tpl
+++ b/gui/bweb/lang/es/tpl/change_location.tpl
@@ -20,7 +20,7 @@ Estimado,
 
 Puede mover este medio a <TMPL_VAR newlocation>
 Medio :
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
  - <TMPL_VAR VolumeName>  (<TMPL_VAR location>)
 </TMPL_LOOP>
 
diff --git a/gui/bweb/lang/es/tpl/display_media.tpl b/gui/bweb/lang/es/tpl/display_media.tpl
index f803c6e3b7..b19014e581 100644
--- a/gui/bweb/lang/es/tpl/display_media.tpl
+++ b/gui/bweb/lang/es/tpl/display_media.tpl
@@ -42,7 +42,7 @@ var img;
 var chkbox;
 var d;
 
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
 d = percent_usage(<TMPL_VAR volusage>);
 
 img = document.createElement('IMG');
diff --git a/gui/bweb/lang/es/tpl/display_media_zoom.tpl b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
index 6f7b564f4c..d9ef11eb4f 100644
--- a/gui/bweb/lang/es/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
@@ -40,7 +40,7 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Location","Vol Status", "Vol Bytes", "Expire",
+var header = new Array("Pool","Online","Enabled","Location","Vol Status", "Vol Bytes", "Expire",
 	               "Retention","Max use duration", "Max jobs" );
 
 var data = new Array();
@@ -52,6 +52,7 @@ img.src = '/bweb/inflag<TMPL_VAR online>.png';
 data.push( new Array(
 "<TMPL_VAR poolname>",
 img,
+human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
diff --git a/gui/bweb/lang/es/tpl/help_extern_compute.tpl b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
index ac1a3db8e4..2b94db3266 100644
--- a/gui/bweb/lang/es/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
@@ -24,7 +24,7 @@ var header = new Array("Nombre Volumen","Estado Volumen",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR NAME=volumename>';
diff --git a/gui/bweb/lang/es/tpl/help_intern_compute.tpl b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
index 8a8cd5c22d..c0731afb92 100644
--- a/gui/bweb/lang/es/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
@@ -10,6 +10,7 @@
     <td style='align: left;'>
     <input type="image" onclick='javascript:window.history.go(-2);' title='Volver' src='/bweb/prev.png'>
     </td><td style='align: right;'>
+    <input type="hidden" name='enabled' value="yes">
     <input type="image" name='action' value='move_media' title='Cargar selección' src='/bweb/intern.png'>
    </td></tr>
    </form>
@@ -24,7 +25,7 @@ var header = new Array("Nombre Volumen","Estado Volumen",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'media';
diff --git a/gui/bweb/lang/es/tpl/move_media.tpl b/gui/bweb/lang/es/tpl/move_media.tpl
index 797d766190..00c0bb99c9 100644
--- a/gui/bweb/lang/es/tpl/move_media.tpl
+++ b/gui/bweb/lang/es/tpl/move_media.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'>Mover Medio</h1>
  </div>
  <div class="bodydiv">
-   <form action='?' method='get'>
+   <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR NAME=ID>'></table>
     <table border='0'>
     <tr><td> Nueva Ubicación: </td><td>
@@ -12,19 +12,11 @@
     <option value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
     </TMPL_LOOP>
 </select>
-    </td></tr><tr><td> Estado: </td><td>
-<select name='volstatus' class='formulaire'>
-    <option value=''>No Actualizar</option>
-    <option value='Append'>Listo</option>
-    <option value='Archive'>Archivado</option>
-    <option value='Disabled'>Desactivado</option>
-    <option value='Cleaning'>Limpieza</option>
-    <option value='Error'>Error</option>
-    <option value='Full'>Lleno</option>
-    <option value='Purged'>Purgado</option>
-    <option value='Read-Only'>ectura</option>
-    <option value='Recycle'>Reciclado</option>
-    <option value='Used'>Usado</option>
+    </td></tr><tr><td> Enabled: </td><td>
+<select name='enabled' class='formulaire'>
+    <option value='no'>no</option>
+    <option value='yes'>yes</option>
+    <option value='archived'>archived</option>
 </select>
     </td><tr><td> Usuario: </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
@@ -46,7 +38,7 @@ var header = new Array("Nombre Volumen", "Ubicaci
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
@@ -82,4 +74,13 @@ nrsTable.setup(
  rows_per_page: rows_per_page
 }
 );
+<TMPL_IF enabled>
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
+</TMPL_IF>
 </script>
diff --git a/gui/bweb/lang/es/tpl/update_location.tpl b/gui/bweb/lang/es/tpl/update_location.tpl
index 11b4335f2a..5e54c0935c 100644
--- a/gui/bweb/lang/es/tpl/update_location.tpl
+++ b/gui/bweb/lang/es/tpl/update_location.tpl
@@ -21,7 +21,7 @@ var header = new Array("Nombre del Volumen", "Ubicaci
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
diff --git a/gui/bweb/lang/es/tpl/update_media.tpl b/gui/bweb/lang/es/tpl/update_media.tpl
index fd7af0f89e..2ce07c7e62 100644
--- a/gui/bweb/lang/es/tpl/update_media.tpl
+++ b/gui/bweb/lang/es/tpl/update_media.tpl
@@ -46,6 +46,15 @@
         </td>
     </tr>
 
+    <tr><td>Enabled:</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
+    </tr>
+
     <tr><td> Ubicación : </td>
         <td><select name='location' class='formulaire'>
         <option value=''></option>
@@ -156,5 +165,12 @@ for (var i=0; ok && i < document.form1.volstatus.length; ++i) {
       ok=0;
    }
 }
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
 
 </script>
diff --git a/gui/bweb/lang/fr/tpl/change_location.tpl b/gui/bweb/lang/fr/tpl/change_location.tpl
index 35029bc9c3..1f7c52937b 100644
--- a/gui/bweb/lang/fr/tpl/change_location.tpl
+++ b/gui/bweb/lang/fr/tpl/change_location.tpl
@@ -20,7 +20,7 @@ Bonjour,
 
 Pouvez vous déplacer ces médias vers <TMPL_VAR newlocation> ?
 Média :
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
  - <TMPL_VAR VolumeName>  (<TMPL_VAR location>)
 </TMPL_LOOP>
 
diff --git a/gui/bweb/lang/fr/tpl/display_media.tpl b/gui/bweb/lang/fr/tpl/display_media.tpl
index 9e4f8ec56a..b5e9eb257b 100644
--- a/gui/bweb/lang/fr/tpl/display_media.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media.tpl
@@ -42,7 +42,7 @@ var img;
 var chkbox;
 var d;
 
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
 d = percent_usage(<TMPL_VAR volusage>);
 
 img = document.createElement('IMG');
diff --git a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
index a73d7b3ba1..7e392008bd 100644
--- a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
@@ -40,7 +40,7 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","En ligne","Localisation","Statut", "Taille", "Expiration",
+var header = new Array("Pool","En ligne","Enabled","Localisation","Statut", "Taille", "Expiration",
 	               "Rétention","Temps maxi d'utilisation", "Nb de job maxi" );
 
 var data = new Array();
@@ -52,6 +52,7 @@ img.src = '/bweb/inflag<TMPL_VAR online>.png';
 data.push( new Array(
 "<TMPL_VAR poolname>",
 img,
+human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
diff --git a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
index 3322739b6f..23379d44c0 100644
--- a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
@@ -24,7 +24,7 @@ var header = new Array("Nom de volume","Statut",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR NAME=volumename>';
diff --git a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
index b08a983565..3db60ef71f 100644
--- a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
@@ -11,6 +11,7 @@
     <td style='align: left;'>
     <input type="image" onclick='javascript:window.history.go(-2);' title='Précédent' src='/bweb/prev.png'>
     </td><td style='align: right;'>
+    <input type="hidden" name='enabled' value="yes">
     <input type="image" name='action' value='move_media'
      src='/bweb/intern.png'>
    </td></tr>
@@ -26,7 +27,7 @@ var header = new Array("Nom de volume","Statut",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'media';
diff --git a/gui/bweb/lang/fr/tpl/move_media.tpl b/gui/bweb/lang/fr/tpl/move_media.tpl
index baca0f4604..25223a38ab 100644
--- a/gui/bweb/lang/fr/tpl/move_media.tpl
+++ b/gui/bweb/lang/fr/tpl/move_media.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'>Déplacer un média</h1>
  </div>
  <div class="bodydiv">
-   <form action='?' method='get'>
+   <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR NAME=ID>'></table>
     <table border='0'>
     <tr><td> Nouvelle localisation : </td><td>
@@ -12,19 +12,11 @@
     <option value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
     </TMPL_LOOP>
 </select>
-    </td></tr><tr><td> Statut : </td><td>
-<select name='volstatus' class='formulaire'>
-    <option value=''>Ne pas modifier</option>
-    <option value='Append'>Append</option>
-    <option value='Archive'>Archive</option>
-    <option value='Disabled'>Disabled</option>
-    <option value='Cleaning'>Cleaning</option>
-    <option value='Error'>Error</option>
-    <option value='Full'>Full</option>
-    <option value='Purged'>Purged</option>
-    <option value='Read-Only'>Read-Only</option>
-    <option value='Recycle'>Recycle</option>
-    <option value='Used'>Used</option>
+    </td></tr><tr><td> Enabled: </td><td>
+<select name='enabled' class='formulaire'>
+    <option value='no'>non</option>
+    <option value='yes'>oui</option>
+    <option value='archived'>archive</option>
 </select>
     </td><tr><td> Utilisateur : </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
@@ -46,7 +38,7 @@ var header = new Array("Nom de volume", "Localisation", "S
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
@@ -82,4 +74,14 @@ nrsTable.setup(
  rows_per_page: rows_per_page
 }
 );
+
+<TMPL_IF enabled>
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
+</TMPL_IF>
 </script>
diff --git a/gui/bweb/lang/fr/tpl/update_location.tpl b/gui/bweb/lang/fr/tpl/update_location.tpl
index acc484ca38..48ac5de29a 100644
--- a/gui/bweb/lang/fr/tpl/update_location.tpl
+++ b/gui/bweb/lang/fr/tpl/update_location.tpl
@@ -21,7 +21,7 @@ var header = new Array("Nom de volume", "Localisation", "S
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
diff --git a/gui/bweb/lang/fr/tpl/update_media.tpl b/gui/bweb/lang/fr/tpl/update_media.tpl
index 4b4e5a13c7..211fc5fe57 100644
--- a/gui/bweb/lang/fr/tpl/update_media.tpl
+++ b/gui/bweb/lang/fr/tpl/update_media.tpl
@@ -46,6 +46,15 @@
         </td>
     </tr>
 
+    <tr><td>Enabled :</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>oui</option>
+           <option value='no'>non</option>
+           <option value='archived'>archive</option>
+           </select>
+        </td>
+    </tr>
+
     <tr><td> Localisation : </td>
         <td><select name='location' class='formulaire'>
       <option value=''></option>
@@ -153,5 +162,12 @@ for (var i=0; ok && i < document.form1.volstatus.length; ++i) {
       ok=0;
    }
 }
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
 
 </script>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 9568798733..d63b9504c8 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1195,6 +1195,20 @@ sub human_sec
     return "$val years";   
 }
 
+# display Enabled
+sub human_enabled
+{
+    my $val = shift || 0;
+
+    if ($val == 1 or $val eq "yes") {
+	return "yes";
+    } elsif ($val == 2 or $val eq "archived") {
+	return "archived";
+    } else {
+	return  "no";
+    }
+}
+
 # get Day, Hour, Year
 sub from_human_sec
 {
@@ -1429,6 +1443,7 @@ sub get_form
 		 poolrecycle => 1,
 		 replace => 1,
 		 expired => 1,
+		 enabled => 1,
 		 );
     my %opt_p = (		# option with path
 		 fileset=> 1,
@@ -1536,9 +1551,9 @@ SELECT MediaType as mediatype
   FROM MediaType
 ";
 
-	my $medias = $self->dbh_selectall_hashref($query, 'mediatype');
+	my $media = $self->dbh_selectall_hashref($query, 'mediatype');
 	$ret{db_mediatypes} = [sort {$a->{mediatype} cmp $b->{mediatype} } 
-			          values %$medias] ;
+			          values %$media] ;
     }
 
     if ($what{db_locations}) {
@@ -1665,16 +1680,16 @@ sub get_selected_media_location
 {
     my ($self) = @_ ;
 
-    my $medias = $self->get_form('jmedias');
+    my $media = $self->get_form('jmedias');
 
-    unless ($medias->{jmedias}) {
+    unless ($media->{jmedias}) {
 	return undef;
     }
 
     my $query = "
 SELECT Media.VolumeName AS volumename, Location.Location AS location
 FROM Media LEFT JOIN Location ON (Media.LocationId = Location.LocationId)
-WHERE Media.VolumeName IN ($medias->{jmedias})
+WHERE Media.VolumeName IN ($media->{jmedias})
 ";
 
     my $all = $self->dbh_selectall_hashref($query, 'volumename') ;
@@ -1688,20 +1703,21 @@ WHERE Media.VolumeName IN ($medias->{jmedias})
 
 sub move_media
 {
-    my ($self) = @_ ;
+    my ($self, $in) = @_ ;
 
-    my $medias = $self->get_selected_media_location();
+    my $media = $self->get_selected_media_location();
 
-    unless ($medias) {
+    unless ($media) {
 	return ;
     }
-    
+
     my $elt = $self->get_form('db_locations');
 
     $self->display({ ID => $cur_id++,
+		     enabled => human_enabled($in),
 		     %$elt,	# db_locations
-		     medias => [ 
-            sort { $a->{volumename} cmp $b->{volumename} } values %$medias
+		     media => [ 
+            sort { $a->{volumename} cmp $b->{volumename} } values %$media
 			       ],
 		     },
 		   "move_media.tpl");
@@ -1753,7 +1769,7 @@ LIMIT $number
     
     my $all = $self->dbh_selectall_hashref($query, 'volumename') ;
 
-    $self->display({ Medias => [ values %$all ] },
+    $self->display({ Media => [ values %$all ] },
 		   "help_extern_compute.tpl");
 }
 
@@ -1809,7 +1825,7 @@ LIMIT $number
     
     my $all = $self->dbh_selectall_hashref($query, 'volumename') ;
 
-    $self->display({ Medias => [ values %$all ] },
+    $self->display({ Media => [ values %$all ] },
 		   "help_intern_compute.tpl");
 
 }
@@ -1881,10 +1897,10 @@ sub get_param
     }
 
     if ($elt{mediatypes}) {
-	my @medias = grep { ! /^\s*$/ } CGI::param('mediatype');
-	if (@medias) {
-	    $ret{mediatypes} = \@medias;
-	    my $str = $self->dbh_join(@medias);
+	my @media = grep { ! /^\s*$/ } CGI::param('mediatype');
+	if (@media) {
+	    $ret{mediatypes} = \@media;
+	    my $str = $self->dbh_join(@media);
 	    $limit .= "AND Media.MediaType IN ($str) ";
 	}
     }
@@ -2217,12 +2233,12 @@ $limit
     $self->display({ ID => $cur_id++,
 		     Pool => $elt{pool},
 		     Location => $elt{location},
-		     Medias => [ values %$all ],
+		     Media => [ values %$all ],
 		   },
 		   "display_media.tpl");
 }
 
-sub display_medias
+sub display_allmedia
 {
     my ($self) = @_ ;
 
@@ -2238,14 +2254,15 @@ sub display_media_zoom
 {
     my ($self) = @_ ;
 
-    my $medias = $self->get_form('jmedias');
+    my $media = $self->get_form('jmedias');
     
-    unless ($medias->{jmedias}) {
+    unless ($media->{jmedias}) {
 	return $self->error("Can't get media selection");
     }
     
     my $query="
 SELECT InChanger     AS online,
+       Media.Enabled AS enabled,
        VolBytes      AS nb_bytes,
        VolumeName    AS volumename,
        VolStatus     AS volstatus,
@@ -2271,7 +2288,7 @@ SELECT InChanger     AS online,
  FROM Pool,
       Media LEFT JOIN Location ON (Media.LocationId = Location.LocationId)
  WHERE Pool.PoolId = Media.PoolId
- AND VolumeName IN ($medias->{jmedias})
+ AND VolumeName IN ($media->{jmedias})
 ";
 
     my $all = $self->dbh_selectall_hashref($query, 'volumename') ;
@@ -2455,8 +2472,8 @@ sub update_location
 {
     my ($self) = @_ ;
 
-    my $medias = $self->get_selected_media_location();
-    unless ($medias) {
+    my $media = $self->get_selected_media_location();
+    unless ($media) {
 	return ;
     }
 
@@ -2464,7 +2481,7 @@ sub update_location
 
     $self->display({ email  => $self->{info}->{email_media},
 		     %$arg,
-                     medias => [ values %$medias ],
+                     media => [ values %$media ],
 		   },
 		   "update_location.tpl");
 }
@@ -2654,7 +2671,8 @@ SELECT Media.Slot         AS slot,
        Media.VolUseDuration AS voluseduration,
        Media.VolRetention AS volretention,
        Media.Comment      AS comment,
-       PoolRecycle.Name   AS poolrecycle
+       PoolRecycle.Name   AS poolrecycle,
+       Media.Enabled      AS enabled
 
 FROM Media INNER JOIN Pool AS PoolMedia ON (Media.PoolId = PoolMedia.PoolId)
            LEFT  JOIN Pool AS PoolRecycle ON (Media.RecyclePoolId = PoolRecycle.PoolId)
@@ -2666,6 +2684,7 @@ WHERE Media.VolumeName = $media->{qmedia}
     my $row = $self->dbh_selectrow_hashref($query);
     $row->{volretention} = human_sec($row->{volretention});
     $row->{voluseduration} = human_sec($row->{voluseduration});
+    $row->{enabled} = human_enabled($row->{enabled});
 
     my $elt = $self->get_form(qw/db_pools db_locations/);
 
@@ -2708,8 +2727,8 @@ sub location_change
 {
     my ($self) = @_ ;
 
-    my $medias = $self->get_selected_media_location();
-    unless ($medias) {
+    my $media = $self->get_selected_media_location();
+    unless ($media) {
 	return $self->error("Can't get media selection");
     }
     my $newloc = CGI::param('newlocation');
@@ -2718,20 +2737,25 @@ sub location_change
     my $comm = CGI::param('comment') || '';
     $comm = $self->dbh_quote("$user: $comm");
 
-    my $query;
+    my $arg = $self->get_form('enabled');
+    my $en = human_enabled($arg->{enabled});
+    my $b = $self->get_bconsole();
 
-    foreach my $media (keys %$medias) {
+    my $query;
+    foreach my $vol (keys %$media) {
 	$query = "
 INSERT LocationLog (Date, Comment, MediaId, LocationId, NewVolStatus)
  VALUES(
-       NOW(), $comm, (SELECT MediaId FROM Media WHERE VolumeName = '$media'),
-       (SELECT LocationId FROM Location WHERE Location = '$medias->{$media}->{location}'),
-       (SELECT VolStatus FROM Media WHERE VolumeName = '$media')
+       NOW(), $comm, (SELECT MediaId FROM Media WHERE VolumeName = '$vol'),
+       (SELECT LocationId FROM Location WHERE Location = '$media->{$vol}->{location}'),
+       (SELECT VolStatus FROM Media WHERE VolumeName = '$vol')
       )
 ";
 	$self->dbh_do($query);
 	$self->debug($query);
+	$b->send_cmd("update volume=\"$vol\" enabled=$en");
     }
+    $b->close();
 
     my $q = new CGI;
     $q->param('action', 'update_location');
@@ -2740,8 +2764,8 @@ INSERT LocationLog (Date, Comment, MediaId, LocationId, NewVolStatus)
     $self->display({ email  => $self->{info}->{email_media},
 		     url => $url,
 		     newlocation => $newloc,
-		     # [ { volumename => 'vol1' }, { volumename => 'vol2' },..]
-		     medias => [ values %$medias ],
+		     # [ { volumename => 'vol1' }, { volumename => 'vol2' },..]
+		     media => [ values %$media ],
 		   },
 		   "change_location.tpl");
 
@@ -3002,7 +3026,7 @@ WHERE Media.VolumeName IN ($arg->{jmedias})
 	    $a->status();
 	    $a->{have_status} = 1;
 	}
-
+	# TODO: set enabled
 	print "eject $vol->{volumename} from $vol->{storage} : ";
 	if ($a->send_to_io($vol->{slot})) {
 	    print "<img src='/bweb/T.png' alt='ok'><br/>";
@@ -3198,7 +3222,7 @@ sub do_update_media
     my $arg = $self->get_form(qw/media volstatus inchanger pool
 			         slot volretention voluseduration 
 			         maxvoljobs maxvolfiles maxvolbytes
-			         qcomment poolrecycle
+			         qcomment poolrecycle enabled
 			      /);
 
     unless ($arg->{media}) {
@@ -3220,6 +3244,10 @@ sub do_update_media
 	$update .= " slot=0 inchanger=no ";
     }
 
+    if ($arg->{enabled}) {
+        $update .= " enabled=$arg->{enabled} ";
+    }
+
     if ($arg->{pool}) {
 	$update .= " pool=$arg->{pool} " ;
     }
diff --git a/gui/bweb/tpl/change_location.tpl b/gui/bweb/tpl/change_location.tpl
index d7f96519ce..e804e060f5 100644
--- a/gui/bweb/tpl/change_location.tpl
+++ b/gui/bweb/tpl/change_location.tpl
@@ -20,7 +20,7 @@ Hi,
 
 Could you move these media to <TMPL_VAR newlocation>
 Media :
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
  - <TMPL_VAR VolumeName>  (<TMPL_VAR location>)
 </TMPL_LOOP>
 
diff --git a/gui/bweb/tpl/display_media.tpl b/gui/bweb/tpl/display_media.tpl
index e4a029b44f..cad256d73b 100644
--- a/gui/bweb/tpl/display_media.tpl
+++ b/gui/bweb/tpl/display_media.tpl
@@ -42,7 +42,7 @@ var img;
 var chkbox;
 var d;
 
-<TMPL_LOOP Medias>
+<TMPL_LOOP media>
 d = percent_usage(<TMPL_VAR volusage>);
 
 img = document.createElement('IMG');
diff --git a/gui/bweb/tpl/display_media_zoom.tpl b/gui/bweb/tpl/display_media_zoom.tpl
index 6dcadbad35..6f8a53a5cb 100644
--- a/gui/bweb/tpl/display_media_zoom.tpl
+++ b/gui/bweb/tpl/display_media_zoom.tpl
@@ -40,7 +40,7 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Location","Vol Status", "Vol Bytes", "Expire",
+var header = new Array("Pool","Online","Enabled", "Location","Vol Status", "Vol Bytes", "Expire",
 	               "Retention","Max use duration", "Max jobs" );
 
 var data = new Array();
@@ -52,6 +52,7 @@ img.src = '/bweb/inflag<TMPL_VAR online>.png';
 data.push( new Array(
 "<TMPL_VAR poolname>",
 img,
+human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
diff --git a/gui/bweb/tpl/help_extern_compute.tpl b/gui/bweb/tpl/help_extern_compute.tpl
index 816353d8f9..906e6c332e 100644
--- a/gui/bweb/tpl/help_extern_compute.tpl
+++ b/gui/bweb/tpl/help_extern_compute.tpl
@@ -24,7 +24,7 @@ var header = new Array("Volume Name","Vol Status",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR NAME=volumename>';
diff --git a/gui/bweb/tpl/help_intern_compute.tpl b/gui/bweb/tpl/help_intern_compute.tpl
index 0f10329d55..cd4aa6db94 100644
--- a/gui/bweb/tpl/help_intern_compute.tpl
+++ b/gui/bweb/tpl/help_intern_compute.tpl
@@ -10,6 +10,7 @@
     <td style='align: left;'>
     <input type="image" onclick='javascript:window.history.go(-2);' title='Back' src='/bweb/prev.png'>
     </td><td style='align: right;'>
+    <input type="hidden" name='enabled' value="yes">
     <input type="image" name='action' value='move_media'
      src='/bweb/intern.png'>
    </td></tr>
@@ -25,7 +26,7 @@ var header = new Array("Volume Name","Vol Status",
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=Medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'media';
diff --git a/gui/bweb/tpl/move_media.tpl b/gui/bweb/tpl/move_media.tpl
index 80520a13a5..3c5c66cd61 100644
--- a/gui/bweb/tpl/move_media.tpl
+++ b/gui/bweb/tpl/move_media.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'>Move media</h1>
  </div>
  <div class="bodydiv">
-   <form action='?' method='get'>
+   <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR NAME=ID>'></table>
     <table border='0'>
     <tr><td> New location: </td><td>
@@ -12,19 +12,11 @@
     <option value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
     </TMPL_LOOP>
 </select>
-    </td></tr><tr><td> Status: </td><td>
-<select name='volstatus' class='formulaire'>
-    <option value=''>Don't update</option>
-    <option value='Append'>Append</option>
-    <option value='Archive'>Archive</option>
-    <option value='Disabled'>Disabled</option>
-    <option value='Cleaning'>Cleaning</option>
-    <option value='Error'>Error</option>
-    <option value='Full'>Full</option>
-    <option value='Purged'>Purged</option>
-    <option value='Read-Only'>Read-Only</option>
-    <option value='Recycle'>Recycle</option>
-    <option value='Used'>Used</option>
+    </td></tr><tr><td> Enabled: </td><td>
+<select name='enabled' class='formulaire'>
+    <option value='no'>no</option>
+    <option value='yes'>yes</option>
+    <option value='archived'>archived</option>
 </select>
     </td><tr><td> User: </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
@@ -46,7 +38,7 @@ var header = new Array("Volume Name", "Location", "Select");
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
@@ -82,4 +74,13 @@ nrsTable.setup(
  rows_per_page: rows_per_page
 }
 );
+<TMPL_IF enabled>
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
+</TMPL_IF>
 </script>
diff --git a/gui/bweb/tpl/update_location.tpl b/gui/bweb/tpl/update_location.tpl
index 75adcbaaaf..93fc9eabf3 100644
--- a/gui/bweb/tpl/update_location.tpl
+++ b/gui/bweb/tpl/update_location.tpl
@@ -21,7 +21,7 @@ var header = new Array("Volume Name", "Location", "Select");
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=medias>
+<TMPL_LOOP NAME=media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
diff --git a/gui/bweb/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index 2c9a0c14ee..f09db42d7a 100644
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -46,6 +46,15 @@
         </td>
     </tr>
 
+    <tr><td>Enabled:</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
+    </tr>
+
     <tr><td> Location : </td>
         <td><select name='location' class='formulaire'>
         <option value=''></option>
@@ -156,5 +165,12 @@ for (var i=0; ok && i < document.form1.volstatus.length; ++i) {
       ok=0;
    }
 }
+ok=1;
+for (var i=0; ok && i < document.form1.enabled.length; ++i) {
+   if (document.form1.enabled[i].value == '<TMPL_VAR enabled>') {
+      document.form1.enabled[i].selected = true;
+      ok=0;
+   }
+}
 
 </script>
-- 
2.39.5