ebl Add a page to see Clients where not in a group

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

diff --git a/gui/bweb/lang/es/tpl/display_groups.tpl b/gui/bweb/lang/es/tpl/display_groups.tpl
index 5959906f9ec1ebda25607ffdd76e8757ed67b958..592656e22383fd76dafa43c4165ecd07482403ec 100644 (file)
--- a/gui/bweb/lang/es/tpl/display_groups.tpl
+++ b/gui/bweb/lang/es/tpl/display_groups.tpl
@@ -17,6 +17,11 @@
      src='/bweb/zoom.png'> 
     <input type="image" name='action' value='group_stats' title='Estadísticas del groups' src='/bweb/chart.png'>&nbsp;
    </form>
+   <form action='?' method='get'>
+    <input type='hidden' name='action' value='client'>
+    <input type="image" name='notingroup' value='yes' title='View non-members'
+     src='/bweb/zoom.png'>&nbsp;
+   </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">

diff --git a/gui/bweb/lang/fr/tpl/display_groups.tpl b/gui/bweb/lang/fr/tpl/display_groups.tpl
index 1e67bf4c7ddc65841dbfaf69e62910e11efa08d2..7d74c0b7fdf9e43f9cf4e4874235e906d442bb9b 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_groups.tpl
+++ b/gui/bweb/lang/fr/tpl/display_groups.tpl
@@ -17,6 +17,11 @@
      src='/bweb/zoom.png'> 
     <input type="image" name='action' value='group_stats' title='Statistiques sur le groupe' src='/bweb/chart.png'>&nbsp;
    </form>
+   <form action='?' method='get'>
+    <input type='hidden' name='action' value='client'>
+    <input type="image" name='notingroup' value='yes' title='Voir les clients sans groupe'
+     src='/bweb/zoom.png'>&nbsp;
+   </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 77a013d48a3d531c77b43c3d788c87526b1a33dd..27fbb0b12f8deca56a42f33357a36200e84a24e1 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1259,7 +1259,7 @@ sub display_clients
     my ($self) = @_;
 
     my $where='';
-    my $arg = $self->get_form("client", "qre_client", "jclient_groups");
+    my $arg = $self->get_form("client", "qre_client", "jclient_groups", "qnotingroup");
 
     if ($arg->{qre_client}) {
        $where = "WHERE Name $self->{sql}->{MATCH} $arg->{qre_client} ";
@@ -1269,6 +1269,14 @@ sub display_clients
        $where = "JOIN client_group_member ON (Client.ClientId = client_group_member.clientid) 
                   JOIN client_group USING (client_group_id)
                   WHERE client_group_name IN ($arg->{jclient_groups})";
+    } elsif ($arg->{qnotingroup}) {
+       $where =   "
+  WHERE NOT EXISTS
+   (SELECT 1 FROM client_group_member
+     WHERE Client.ClientId = client_group_member.ClientId
+   )
+";
+   
     }
 
     my $query = "

diff --git a/gui/bweb/tpl/display_groups.tpl b/gui/bweb/tpl/display_groups.tpl
index 3600d4094d5ea99cad006c3e2eee5f4b607ac3e3..f678ce8e88f117c45bba9bbf253f0a04b1b4ff40 100644 (file)
--- a/gui/bweb/tpl/display_groups.tpl
+++ b/gui/bweb/tpl/display_groups.tpl
@@ -17,6 +17,11 @@
      src='/bweb/zoom.png'> 
     <input type="image" name='action' value='group_stats' title='Statistics' src='/bweb/chart.png'>&nbsp;
    </form>
+   <form action='?' method='get'>
+    <input type='hidden' name='action' value='client'>
+    <input type="image" name='notingroup' value='yes' title='View non-members'
+     src='/bweb/zoom.png'>&nbsp;
+   </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">