Add Domain Group Management

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-12-13 15:29:42 +00:00
parent 600c16c269
commit 912e2ddbd9
6 changed files with 563 additions and 11 deletions

View File

@@ -70,8 +70,8 @@ $(document).ready(function() {
{ data: null, width: "60px", "orderable": false }
],
"drawCallback": function( settings ) {
$('.deleteClient').on('click', deleteClient);
$('.editClient').on('click', editClient);
$('.deleteClient').on('click', deleteClient);
},
"rowCallback": function( row, data ) {
$('td:eq(1)', row).html( "<code>"+data["ip"]+"</code>" );
@@ -96,26 +96,22 @@ $(document).ready(function() {
let button = "<button class=\"btn btn-success btn-xs editClient\" type=\"button\" data-id='"+data["id"]+"'>" +
"<span class=\"glyphicon glyphicon-pencil\"></span>" +
"</button>";
if(data["id"] !== 0)
{
button +=
"</button>" +
" &nbsp;" +
"<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 );
},
"lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
"stateSave": true,
stateSaveCallback: function(settings, data) {
// Store current state in client's local storage area
localStorage.setItem("groups-table", JSON.stringify(data));
localStorage.setItem("groups-clients-table", JSON.stringify(data));
},
stateLoadCallback: function(settings) {
// Receive previous state from client's local storage area
var data = localStorage.getItem("groups-table");
var data = localStorage.getItem("groups-clients-table");
// Return if not available
if(data === null){ return null; }
data = JSON.parse(data);

View File

@@ -0,0 +1,214 @@
var table, groups;
function showAlert(type, message)
{
var alertElement = null;
var messageElement = null;
switch (type)
{
case 'info': alertElement = $('#alInfo'); break;
case 'success': alertElement = $('#alSuccess'); break;
case 'warning': alertElement = $('#alWarning'); messageElement = $('#warn'); break;
case 'error': alertElement = $('#alFailure'); messageElement = $('#err'); break;
default: return;
}
if (messageElement != null)
messageElement.html(message);
alertElement.fadeIn(200);
alertElement.delay(8000).fadeOut(2000);
}
function get_groups()
{
$.get("scripts/pi-hole/php/groups.php", { 'action': 'get_groups' },
function(data) {
groups = data.data;
}, "json");
}
$.fn.redraw = function(){
return $(this).each(function(){
var redraw = this.offsetHeight;
});
};
$(document).ready(function() {
$('#btnAdd').on('click', addDomain);
get_groups();
$('#select').on('change', function() {
$("#ip-custom").val("");
$("#ip-custom").prop( "disabled" , $( "#select option:selected" ).val() !== "custom");
});
table = $("#domainsTable").DataTable( {
"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 }
],
"drawCallback": function( settings ) {
$('.editDomain').on('click', editDomain);
$('.deleteDomain').on('click', deleteDomain);
},
"rowCallback": function( row, data ) {
$('td:eq(0)', row).html( '<code>'+data["domain"]+'</code>' );
$('td:eq(1)', row).html( '<select id="type">'+
'<option value="0"'+(data["type"]===0?' selected':'')+'>Exact whitelist</option>'+
'<option value="1"'+(data["type"]===1?' selected':'')+'>Exact blacklist</option>'+
'<option value="2"'+(data["type"]===2?' selected':'')+'>Regex whitelist</option>'+
'<option value="3"'+(data["type"]===3?' selected':'')+'>Regex blacklist</option>'+
'</select>' );
const disabled = data["enabled"] === 0;
$('td:eq(2)', row).html( '<select id="status">'+
'<option value="0"'+(disabled?' selected':'')+'>Disabled</option>'+
'<option value="1"'+(disabled?'':' selected')+'>Enabled</option>'+
'</select>' );
$('td:eq(3)', row).html( '<input id="comment"><input id="id" type="hidden" value="'+data["id"]+'">' );
$('#comment', row).val(data["comment"]);
$('td:eq(4)', row).empty();
$('td:eq(4)', row).append( '<select id="multiselect" multiple="multiple"></select>' );
var sel = $('#multiselect', row);
// Add all known groups
for (var i = 0; i < groups.length; i++) {
var extra = 'ID ' + groups[i].id;
if(!groups[i].enabled)
{
extra += ', disabled';
}
sel.append($('<option />').val(groups[i].id).text(groups[i].name + ' (' + extra + ')'));
sel.redraw();
}
// Select assigned groups
sel.val(data.groups);
// Initialize multiselect
sel.multiselect({ includeSelectAllOption: true });
let button = "<button class=\"btn btn-success btn-xs editDomain\" type=\"button\" data-id='"+data["id"]+"'>" +
"<span class=\"glyphicon glyphicon-pencil\"></span>" +
"</button>" +
" &nbsp;" +
"<button class=\"btn btn-danger btn-xs deleteDomain\" type=\"button\" data-id='"+data["id"]+"'>" +
"<span class=\"glyphicon glyphicon-trash\"></span>" +
"</button>";
$('td:eq(5)', row).html( button );
},
"lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
"stateSave": true,
stateSaveCallback: function(settings, data) {
// Store current state in client's local storage area
localStorage.setItem("groups-domains-table", JSON.stringify(data));
},
stateLoadCallback: function(settings) {
// Receive previous state from client's local storage area
var data = localStorage.getItem("groups-domains-table");
// Return if not available
if(data === null){ return null; }
data = JSON.parse(data);
// Always start on the first page to show most recent queries
data["start"] = 0;
// Always start with empty search field
data["search"]["search"] = "";
// Apply loaded state to table
return data;
}
});
});
function addDomain()
{
var domain = $("#domain").val();
var type = $("#type").val();
var comment = $("#comment").val();
showAlert('info');
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: 'json',
data: {"action": "add_domain", "domain": domain, "type": type, "comment": comment},
success: function(response) {
if (response.success) {
showAlert('success');
$("#domain").empty();
$("#comment").empty();
table.ajax.reload();
}
else
showAlert('error', response.message);
},
error: function(jqXHR, exception) {
showAlert('error', "Error while adding new group");
console.log(exception);
}
});
}
function editDomain()
{
var tr = $(this).closest("tr");
var id = tr.find("#id").val();
var type = tr.find("#type").val();
var status = tr.find("#status").val();
var comment = tr.find("#comment").val();
var groups = tr.find("#multiselect").val();
showAlert('info');
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: 'json',
data: {"action": "edit_domain", "id": id, "type": type, "comment": comment, "status": status, "groups": groups},
success: function(response) {
if (response.success) {
showAlert('success');
table.ajax.reload();
}
else
showAlert('error', response.message);
},
error: function(jqXHR, exception) {
showAlert('error', "Error while editing domain with ID "+id);
console.log(exception);
}
});
}
function deleteDomain()
{
var id = $(this).attr("data-id");
showAlert('info');
$.ajax({
url: "scripts/pi-hole/php/groups.php",
method: "post",
dataType: 'json',
data: {"action": "delete_domain", "id": id},
success: function(response) {
if (response.success) {
showAlert('success');
table.ajax.reload();
}
else
showAlert('error', response.message);
},
error: function(jqXHR, exception) {
showAlert('error', "Error while deleting domain with ID "+id);
console.log(exception);
}
});
}

View File

@@ -29,11 +29,11 @@ $(document).ready(function() {
"ajax": "scripts/pi-hole/php/groups.php?action=get_groups",
order: [[ 1, 'asc' ]],
columns: [
{ data: "id", width: "10px" },
{ data: "id", width: "60px" },
{ data: "enabled" },
{ data: "name" },
{ data: "description" },
{ data: null, width: "20px" }
{ data: null, width: "60px", "orderable": false }
],
"drawCallback": function( settings ) {
$('.deleteGroup').on('click', deleteGroup);
@@ -103,6 +103,8 @@ function addGroup()
success: function(response) {
if (response.success) {
showAlert('success');
$("#name").empty();
$("#desc").empty();
table.ajax.reload();
}
else