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

Do not try to load messages on the login page

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-02-05 17:54:20 +01:00
parent 442a931f71
commit 444b4f4864
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/pi-hole/js/footer.js
View File

@@ -475,10 +475,12 @@ $(function () {
// Apply per-browser styling settings
initCheckboxRadioStyle();
// Run check immediately after page loading ...
utils.checkMessages();
// ... and once again with five seconds delay
setTimeout(utils.checkMessages, 5000);
if (window.location.pathname !== "/admin/login.php") {
// Run check immediately after page loading ...
utils.checkMessages();
// ... and once again with five seconds delay
setTimeout(utils.checkMessages, 5000);
}
});
// Handle Enable/Disable

11
scripts/pi-hole/js/settings.js
View File

@@ -140,15 +140,16 @@ function fillDNSupstreams(value, servers) {
var upstreams = $("#DNSupstreamsTextfield").val().split("\n");
var customServers = 0;
$("#DNSupstreamsTable input").each(function () {
if (this.checked && !upstreams.includes(this.title)) {
var title = $(this).closest("td").attr("title");
if (this.checked && !upstreams.includes(title)) {
// Add server to array
upstreams.push(this.title);
} else if (!this.checked && upstreams.includes(this.title)) {
upstreams.push(title);
} else if (!this.checked && upstreams.includes(title)) {
// Remove server from array
removeFromArray(upstreams, this.title);
removeFromArray(upstreams, title);
}
if (upstreams.includes(this.title)) customServers--;
if (upstreams.includes(title)) customServers--;
});
// The variable will contain a negative value, we need to add the length to
// get the correct number of custom servers