Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into wildcard_blacklisting

Browse Source 
Conflicts:
	scripts/pi-hole/js/queries.js
This commit is contained in:
DL6ER
2017-01-02 16:04:58 +01:00
parent 01d0f474a3 32464ab976
commit 3c3f6ef916
8 changed files with 355 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/pi-hole/js/queries.js
View File

@@ -72,6 +72,23 @@ function add(domain,list) {
$(document).ready(function() {
var status;
// Do we want to filter queries?
var GETDict = {};
location.search.substr(1).split("&").forEach(function(item) {GETDict[item.split("=")[0]] = item.split("=")[1];});
var APIstring = "api.php?getAllQueries";
if("from" in GETDict)
{
APIstring += "&from="+GETDict["from"];
}
if("until" in GETDict)
{
APIstring += "&until="+GETDict["until"];
}
tableApi = $("#all-queries").DataTable( {
"rowCallback": function( row, data, index ){
status = data[4];
@@ -89,7 +106,7 @@ $(document).ready(function() {
"<'row'<'col-sm-4'l><'col-sm-8'p>>" +
"<'row'<'col-sm-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
"ajax": "api.php?getAllQueries",
"ajax": APIstring,
"autoWidth" : false,
"order" : [[0, "desc"]],
"columns": [
@@ -120,9 +137,6 @@ $(document).ready(function() {
}
} );
// Do we want to filter queries?
var GETDict = {};
location.search.substr(1).split("&").forEach(function(item) {GETDict[item.split("=")[0]] = item.split("=")[1];});
if("client" in GETDict)
{
// Search in third column (zero indexed)