ebl Update Location.Enabled to be like Media.Enabled

     Fix Mysql log output

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

diff --git a/gui/bweb/lang/es/tpl/location_edit.tpl b/gui/bweb/lang/es/tpl/location_edit.tpl
index 11856be10c43b993afb39fc574412147f325c97c..16cdde2ef3588e4b3ac9fd6b1b456ed6e15170eb 100644 (file)
--- a/gui/bweb/lang/es/tpl/location_edit.tpl
+++ b/gui/bweb/lang/es/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Ubicación : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Ubicación :</td>     
@@ -16,11 +16,24 @@
          </td>
      </tr>
      <tr><td>Activado :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </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>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+<script type="text/javascript" language='JavaScript'>
+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/location_edit.tpl b/gui/bweb/lang/fr/tpl/location_edit.tpl
index ef196866c61cb0dd0769f66504814029ccb7703e..117359e6b513bbecaeddfbe1b00574f14887fde5 100644 (file)
--- a/gui/bweb/lang/fr/tpl/location_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Localisation : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Localisation :</td>     
@@ -15,12 +15,25 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Enabled :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </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>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+<script type="text/javascript" language='JavaScript'>
+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 3e29c344385f2b1d0162dd78b6ae93052454cd2a..aae48d00a3cef9baf3ca1ce5983fe2e417a0ddd0 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1208,15 +1208,29 @@ sub human_enabled
 {
     my $val = shift || 0;
 
-    if ($val == 1 or $val eq "yes") {
+    if ($val eq '1' or $val eq "yes") {
        return "yes";
-    } elsif ($val == 2 or $val eq "archived") {
+    } elsif ($val eq '2' or $val eq "archived") {
        return "archived";
     } else {
        return  "no";
     }
 }
 
+# display Enabled
+sub from_human_enabled
+{
+    my $val = shift || 0;
+
+    if ($val == 1 or $val eq "yes") {
+       return 1;
+    } elsif ($val == 2 or $val eq "archived") {
+       return 2;
+    } else {
+       return  0;
+    }
+}
+
 # get Day, Hour, Year
 sub from_human_sec
 {
@@ -1255,6 +1269,8 @@ sub connect_db
 
        if ($self->{info}->{dbi} =~ /^dbi:Pg/i) {
            $self->{dbh}->do("SET datestyle TO 'ISO, YMD'");
+       } else {
+           $self->{dbh}->do("SET group_concat_max_len=1000000");
        }
     }
 }
@@ -2372,7 +2388,7 @@ WHERE Location.Location = $loc->{qlocation}
 ";
 
     my $row = $self->dbh_selectrow_hashref($query);
-
+    $row->{enabled} = human_enabled($row->{enabled});
     $self->display({ ID => $cur_id++,
                     %$row }, "location_edit.tpl") ;
 }
@@ -2382,7 +2398,7 @@ sub location_save
     my ($self) = @_ ;
     $self->can_do('r_location_mgnt');
 
-    my $arg = $self->get_form(qw/qlocation qnewlocation cost/) ;
+    my $arg = $self->get_form(qw/qlocation qnewlocation cost enabled/) ;
     unless ($arg->{qlocation}) {
        return $self->error("Can't get location");
     }    
@@ -2393,8 +2409,7 @@ sub location_save
        return $self->error("Can't get new cost");
     }
 
-    my $enabled = CGI::param('enabled') || '';
-    $enabled = $enabled?1:0;
+    my $enabled = from_human_enabled($arg->{enabled});
 
     my $query = "
 UPDATE Location SET Cost     = $arg->{cost}, 

diff --git a/gui/bweb/tpl/location_edit.tpl b/gui/bweb/tpl/location_edit.tpl
index 75ad5b6e12402c5239be0d84e74da32da98f8d00..c7f28afe57375f6a0329d3e1f09092082e31cea7 100644 (file)
--- a/gui/bweb/tpl/location_edit.tpl
+++ b/gui/bweb/tpl/location_edit.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> Location : <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
-   <form action="?" method='get'>
+   <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
      <tr><td>Location :</td>     
@@ -15,12 +15,26 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Enabled :</td> 
-         <td> <input class="formulaire" type='checkbox' name='enabled' <TMPL_IF enabled> checked </TMPL_IF> >
-         </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>
     </table>
     <input type="image" name='action' value='location_save'
      src='/bweb/save.png'>
    </form>
 </div>
+
+<script type="text/javascript" language='JavaScript'>
+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>