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

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index 4751b35cb18a23e10bc3a2a1f35a3196a6225d90..5594e2d09ef037059a2d11a992130c55fec3264d 100755 (executable)
--- 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 4f69e4bb3f4138f9b7433168e3d22f535362f2db..5b47a2b06db1fa7b5f36b1601edab168978ee688 100644 (file)
--- 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 498db47df69d80798308ffe2e5ac34ae9c2fbf2a..7eaf58b1229e05cf54f9f6ddea3878980c981d39 100644 (file)
--- 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 4f69e4bb3f4138f9b7433168e3d22f535362f2db..5b47a2b06db1fa7b5f36b1601edab168978ee688 100644 (file)
--- 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 52f762ff5a24fd652615bff4d5d73ac1d90a8e64..0459f5c489012ebf95ada9ed76c802ed84aae2e3 100644 (file)
--- 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 ac2629ffd41374655adab5ab5797a1f6f870eb64..834ab915de0fd4c66fa91e5fce6c09e0e425a134 100644 (file)
--- 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 47d8e758d9296d902325330e3bc541ce4facfbf4..6c13e52b2b72a2ae867d31f568017be05e10cac7 100644 (file)
--- 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 95702192debb5306c474331a7e90b6ec3cdec6f4..81f36e85b4872056d6b49ce901dc1790bcca8106 100644 (file)
--- 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 962e89cc8e845f477868e9fa1de2d524c6eb620a..725fc6c336dc282a70c40d73bb917f8804299842 100644 (file)
--- 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 85b400f33117c18e7326cd5ba27847d9b56d430e..5aee981ceef89478203c9a498d747fe8a37a6121 100644 (file)
--- 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>