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

Merge branch 'release/v5.2' into new/mac_clients

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-07-30 21:56:21 +02:00
parent a901489a96 0865123914
commit 1b129bcad0
30 changed files with 1169 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/pi-hole/js/utils.js
View File

@@ -104,8 +104,9 @@ function showAlert(type, icon, title, message) {
}
}
function datetime(date) {
return moment.unix(Math.floor(date)).format("Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z");
function datetime(date, html) {
var format = html === false ? "Y-MM-DD HH:mm:ss z" : "Y-MM-DD [<br class='hidden-lg'>]HH:mm:ss z";
return moment.unix(Math.floor(date)).format(format);
}
function disableAll() {
@@ -208,7 +209,14 @@ function stateLoadCallback(itemName) {
return null;
}
// Parse JSON string
data = JSON.parse(data);
// Clear possible filtering settings
data.columns.forEach(function (value, index) {
data.columns[index].search.search = "";
});
// Always start on the first page to show most recent queries
data.start = 0;
// Always start with empty search field