From 4b11ae3d17b5be2d4066903d863644fd1d18b344 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 4 Jan 2009 10:27:53 +0000
Subject: [PATCH] ebl  Fix group edition for client ebl  cleanup

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8309 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/cgi/bweb.pl                 |  4 ++--
 gui/bweb/lang/en/tpl/client_edit.tpl | 14 +++++++-------
 gui/bweb/lang/en/tpl/client_list.tpl |  2 +-
 gui/bweb/lang/es/tpl/client_edit.tpl | 14 +++++++-------
 gui/bweb/lang/es/tpl/client_list.tpl |  2 +-
 gui/bweb/lang/fr/tpl/client_edit.tpl | 14 +++++++-------
 gui/bweb/lang/fr/tpl/client_list.tpl |  2 +-
 gui/bweb/technotes-3.0               |  2 ++
 gui/bweb/tpl/client_edit.tpl         | 14 +++++++-------
 gui/bweb/tpl/client_list.tpl         |  2 +-
 10 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index 4751b35cb1..5594e2d09e 100755
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -373,7 +373,7 @@ if ($action eq 'begin') {		# main display
 } elsif ($action eq 'client_stats') {
 
     foreach my $client (CGI::param('client')) {
-	if ($client =~ m/$client_re/) {
+	if ($client =~ $client_re) {
 	    $bweb->display_client_stats(clientname => $1,
 					age => $arg->{age});
 	}
@@ -422,7 +422,7 @@ if ($action eq 'begin') {		# main display
     $bweb->can_do('r_client_status');
     my $b;
     foreach my $client (CGI::param('client')) {
-	if ($client =~ m/$client_re/) {
+	if ($client =~ $client_re) {
 	    $client = $1;
 	    $b = new Bconsole(pref => $conf) 
 		unless ($b) ;
diff --git a/gui/bweb/lang/en/tpl/client_edit.tpl b/gui/bweb/lang/en/tpl/client_edit.tpl
index 4f69e4bb3f..5b47a2b06d 100644
--- a/gui/bweb/lang/en/tpl/client_edit.tpl
+++ b/gui/bweb/lang/en/tpl/client_edit.tpl
@@ -20,19 +20,19 @@
 var header = new Array("Group Name", "Description", "Selection");
 
 var data = new Array();
-var radiobox ;
+var chkbox ;
 
 <TMPL_LOOP client_group>
-radiobox = document.createElement('INPUT');
-radiobox.type  = 'radio';
-radiobox.name = 'client_group';
-radiobox.value = '<TMPL_VAR client_group_name>';
-radiobox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
+chkbox = document.createElement('INPUT');
+chkbox.type  = 'checkbox';
+chkbox.name = 'client_group';
+chkbox.value = '<TMPL_VAR client_group_name>';
+chkbox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
 
 data.push( 
   new Array( "<TMPL_VAR client_group_name>", 
 	     "<TMPL_VAR comment>",
-             radiobox
+             chkbox
               )
 ) ; 
 </TMPL_LOOP>
diff --git a/gui/bweb/lang/en/tpl/client_list.tpl b/gui/bweb/lang/en/tpl/client_list.tpl
index 498db47df6..7eaf58b122 100644
--- a/gui/bweb/lang/en/tpl/client_list.tpl
+++ b/gui/bweb/lang/en/tpl/client_list.tpl
@@ -15,7 +15,7 @@
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Show client status'> <img src='/bweb/zoom.png' alt=''>Status </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Client stats'> <img src='/bweb/chart.png' alt=''>Stats </button>
-       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit groups </button>
         </div>
 
 </form>
diff --git a/gui/bweb/lang/es/tpl/client_edit.tpl b/gui/bweb/lang/es/tpl/client_edit.tpl
index 4f69e4bb3f..5b47a2b06d 100644
--- a/gui/bweb/lang/es/tpl/client_edit.tpl
+++ b/gui/bweb/lang/es/tpl/client_edit.tpl
@@ -20,19 +20,19 @@
 var header = new Array("Group Name", "Description", "Selection");
 
 var data = new Array();
-var radiobox ;
+var chkbox ;
 
 <TMPL_LOOP client_group>
-radiobox = document.createElement('INPUT');
-radiobox.type  = 'radio';
-radiobox.name = 'client_group';
-radiobox.value = '<TMPL_VAR client_group_name>';
-radiobox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
+chkbox = document.createElement('INPUT');
+chkbox.type  = 'checkbox';
+chkbox.name = 'client_group';
+chkbox.value = '<TMPL_VAR client_group_name>';
+chkbox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
 
 data.push( 
   new Array( "<TMPL_VAR client_group_name>", 
 	     "<TMPL_VAR comment>",
-             radiobox
+             chkbox
               )
 ) ; 
 </TMPL_LOOP>
diff --git a/gui/bweb/lang/es/tpl/client_list.tpl b/gui/bweb/lang/es/tpl/client_list.tpl
index 52f762ff5a..0459f5c489 100644
--- a/gui/bweb/lang/es/tpl/client_list.tpl
+++ b/gui/bweb/lang/es/tpl/client_list.tpl
@@ -15,7 +15,7 @@
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Mostrar estado del cliente'> <img src='/bweb/zoom.png' alt=''>Estado </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Estado </button>
-       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Editar </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit groups </button>
         </div>
 
 </form>
diff --git a/gui/bweb/lang/fr/tpl/client_edit.tpl b/gui/bweb/lang/fr/tpl/client_edit.tpl
index ac2629ffd4..834ab915de 100644
--- a/gui/bweb/lang/fr/tpl/client_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/client_edit.tpl
@@ -20,19 +20,19 @@
 var header = new Array("Group Name", "Description", "Sélection");
 
 var data = new Array();
-var radiobox ;
+var chkbox ;
 
 <TMPL_LOOP client_group>
-radiobox = document.createElement('INPUT');
-radiobox.type  = 'radio';
-radiobox.name = 'client_group';
-radiobox.value = '<TMPL_VAR client_group_name>';
-radiobox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
+chkbox = document.createElement('INPUT');
+chkbox.type  = 'checkbox';
+chkbox.name = 'client_group';
+chkbox.value = '<TMPL_VAR client_group_name>';
+chkbox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
 
 data.push( 
   new Array( "<TMPL_VAR client_group_name>", 
 	     "<TMPL_VAR comment>",
-             radiobox
+             chkbox
               )
 ) ; 
 </TMPL_LOOP>
diff --git a/gui/bweb/lang/fr/tpl/client_list.tpl b/gui/bweb/lang/fr/tpl/client_list.tpl
index 47d8e758d9..6c13e52b2b 100644
--- a/gui/bweb/lang/fr/tpl/client_list.tpl
+++ b/gui/bweb/lang/fr/tpl/client_list.tpl
@@ -15,7 +15,7 @@
        <button type="submit" class="bp" name='action' value='groups' title='View client groups'> <img src='/bweb/zoom.png' alt=''>View groups</button>
        <button type="submit" class="bp" name='action' value='client_status' title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Statut </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='Statistiques'> <img src='/bweb/chart.png' alt=''>Stats </button>
-       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Modifier </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='Client groups'> <img src='/bweb/edit.png' alt=''>Edit groups </button>
         </div>
 
 </form>
diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0
index 95702192de..81f36e85b4 100644
--- a/gui/bweb/technotes-3.0
+++ b/gui/bweb/technotes-3.0
@@ -1,3 +1,5 @@
+04Jan09
+ebl  Fix group edition for client
 03Jan09
 ebl  Use a special icon for Admin/Migration/Copy etc.. job
 23Dec08
diff --git a/gui/bweb/tpl/client_edit.tpl b/gui/bweb/tpl/client_edit.tpl
index 962e89cc8e..725fc6c336 100644
--- a/gui/bweb/tpl/client_edit.tpl
+++ b/gui/bweb/tpl/client_edit.tpl
@@ -20,19 +20,19 @@
 var header = new Array("__Group Name__", "__Description__", "__Selection__");
 
 var data = new Array();
-var radiobox ;
+var chkbox ;
 
 <TMPL_LOOP client_group>
-radiobox = document.createElement('INPUT');
-radiobox.type  = 'radio';
-radiobox.name = 'client_group';
-radiobox.value = '<TMPL_VAR client_group_name>';
-radiobox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
+chkbox = document.createElement('INPUT');
+chkbox.type  = 'checkbox';
+chkbox.name = 'client_group';
+chkbox.value = '<TMPL_VAR client_group_name>';
+chkbox.checked = <TMPL_IF here>1<TMPL_ELSE>0</TMPL_IF>;
 
 data.push( 
   new Array( "<TMPL_VAR client_group_name>", 
 	     "<TMPL_VAR comment>",
-             radiobox
+             chkbox
               )
 ) ; 
 </TMPL_LOOP>
diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index 85b400f331..5aee981cee 100644
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -15,7 +15,7 @@
        <button type="submit" class="bp" name='action' value='groups' title='__View client groups__'> <img src='/bweb/zoom.png' alt=''>__View groups__</button>
        <button type="submit" class="bp" name='action' value='client_status' title='__Show client status__'> <img src='/bweb/zoom.png' alt=''>__Status__ </button>
        <button type="submit" class="bp" name='action' value='client_stats' title='__Client stats__'> <img src='/bweb/chart.png' alt=''>__Stats__ </button>
-       <button type="submit" class="bp" name='action' value='client_edit' title='__Client groups__'> <img src='/bweb/edit.png' alt=''>__Edit__ </button>
+       <button type="submit" class="bp" name='action' value='client_edit' title='__Client groups__'> <img src='/bweb/edit.png' alt=''>__Edit groups__ </button>
         </div>
 
 </form>
-- 
2.39.5