Make sure all fields are searchable on all pages (where this is meaningful) and remove ID column from clients group page.

Signed-off-by: DL6ER <dl6er@dl6er.de>

groups-adlists.php

@@ -10,7 +10,7 @@
 
 <!-- Title -->
 <div class="page-header">
-    <h1>Adllist group management</h1>
+    <h1>Adlist group management</h1>
 </div>
 
 <!-- Alerts -->

groups-clients.php

@@ -75,7 +75,6 @@
                 <table id="clientsTable" class="display table table-striped table-bordered" cellspacing="0" width="100%">
                     <thead>
                     <tr>
-                        <th>ID</th>
                         <th>IP address</th>
                         <th>Group assignment</th>
                         <th>Action</th>

scripts/pi-hole/js/groups-adlists.js

@@ -50,11 +50,11 @@ $(document).ready(function() {
         "ajax": "scripts/pi-hole/php/groups.php?action=get_adlists",
         order: [[ 1, 'asc' ]],
         columns: [
-            { data: null },
-            { data: null, "orderable": false },
-            { data: null, "orderable": false },
-            { data: null, "orderable": false },
-            { data: null, width: "60px", "orderable": false }
+            { data: "address" },
+            { data: "enabled", searchable: false },
+            { data: "comment" },
+            { data: "groups", searchable: false },
+            { data: null, width: "60px", orderable: false }
         ],
         "drawCallback": function( settings ) {
             $('.editAdlist').on('click', editAdlist);

scripts/pi-hole/js/groups-clients.js

@@ -64,20 +64,19 @@ $(document).ready(function() {
         "ajax": "scripts/pi-hole/php/groups.php?action=get_clients",
         order: [[ 1, 'asc' ]],
         columns: [
-            { data: "id", width: "60px" },
             { data: "ip", width: "20%" },
-            { data: null, "orderable": false },
-            { data: null, width: "60px", "orderable": false }
+            { data: "groups", searchable: false },
+            { data: null, width: "60px", orderable: false }
         ],
         "drawCallback": function( settings ) {
             $('.editClient').on('click', editClient);
             $('.deleteClient').on('click', deleteClient);
         },
         "rowCallback": function( row, data ) {
-            $('td:eq(1)', row).html( "<code>"+data["ip"]+"</code>" );
+            $('td:eq(0)', row).html( '<code>'+data["ip"]+'</code><input id="id" type="hidden" value="'+data["id"]+'">' );
 
-            $('td:eq(2)', row).empty();
-            $('td:eq(2)', row).append( '<select id="multiselect" multiple="multiple"></select>' );
+            $('td:eq(1)', row).empty();
+            $('td:eq(1)', row).append( '<select id="multiselect" multiple="multiple"></select>' );
             var sel = $('#multiselect', row);
             // Add all known groups
             for (var i = 0; i < groups.length; i++) {
@@ -101,7 +100,7 @@ $(document).ready(function() {
                          "<button class=\"btn btn-danger btn-xs deleteClient\" type=\"button\" data-id='"+data["id"]+"'>" +
                          "<span class=\"glyphicon glyphicon-trash\"></span>" +
                          "</button>";
-            $('td:eq(3)', row).html( button );
+            $('td:eq(2)', row).html( button );
         },
         "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
         "stateSave": true,

scripts/pi-hole/js/groups-domains.js

@@ -50,12 +50,12 @@ $(document).ready(function() {
         "ajax": "scripts/pi-hole/php/groups.php?action=get_domains",
         order: [[ 1, 'asc' ]],
         columns: [
-            { data: null },
-            { data: null, "orderable": false },
-            { data: null, "orderable": false },
-            { data: null, "orderable": false },
-            { data: null, "orderable": false },
-            { data: null, width: "60px", "orderable": false }
+            { data: "domain" },
+            { data: "type", searchable: false },
+            { data: "enabled", searchable: false },
+            { data: "comment" },
+            { data: "groups", searchable: false },
+            { data: null, width: "60px", orderable: false }
         ],
         "drawCallback": function( settings ) {
             $('.editDomain').on('click', editDomain);

scripts/pi-hole/js/groups.js

@@ -30,10 +30,10 @@ $(document).ready(function() {
         order: [[ 1, 'asc' ]],
         columns: [
             { data: "id", width: "60px" },
-            { data: "enabled" },
+            { data: "enabled", searchable: false },
             { data: "name" },
             { data: "description" },
-            { data: null, width: "60px", "orderable": false }
+            { data: null, width: "60px", orderable: false }
         ],
         "drawCallback": function( settings ) {
             $('.deleteGroup').on('click', deleteGroup);