diff --git a/scripts/pi-hole/js/settings-teleporter.js b/scripts/pi-hole/js/settings-teleporter.js index 8ed019cd..03e730d6 100644 --- a/scripts/pi-hole/js/settings-teleporter.js +++ b/scripts/pi-hole/js/settings-teleporter.js @@ -27,7 +27,22 @@ function importZIP() { return; } + // Get the selected import options + const imports = {}, + gravity = {}; + imports.config = document.getElementById("import.config").checked; + imports.dhcp_leases = document.getElementById("import.dhcp_leases").checked; + gravity.group = document.getElementById("import.gravity.group").checked; + gravity.adlist = document.getElementById("import.gravity.adlist").checked; + gravity.adlist_by_group = document.getElementById("import.gravity.adlist").checked; + gravity.domainlist = document.getElementById("import.gravity.domainlist").checked; + gravity.domainlist_by_group = document.getElementById("import.gravity.domainlist").checked; + gravity.client = document.getElementById("import.gravity.client").checked; + gravity.client_by_group = document.getElementById("import.gravity.client").checked; + imports.gravity = gravity; + const formData = new FormData(); + formData.append("import", JSON.stringify(imports)); formData.append("file", file); // eslint-disable-next-line compat/compat fetch("/api/teleporter", { diff --git a/settings-teleporter.lp b/settings-teleporter.lp index b2c6eec0..432c4b05 100644 --- a/settings-teleporter.lp +++ b/settings-teleporter.lp @@ -33,7 +33,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
-

Import previously imported configuration

+

Import previously exported configuration

@@ -42,6 +42,15 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')

When importing settings from a newer version of Pi-hole, not yet existing settings will be ignored. When importing from an older version of Pi-hole, settings for newer features will be initialized with their default values.

+
+ +
 
+
 
+
 
+
 
+
 
+
 
+