summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Grishin <stangri@melmac.ca>2024-01-09 03:43:13 -0700
committerGitHub <noreply@github.com>2024-01-09 03:43:13 -0700
commitfd9c8aeef22bde9cff3602e6ff4a9135021e4384 (patch)
treef6c376bc6fe0076e61a5d058936533b069f4e438
parentfd9b2712c583a9b5fbc79f21419143e47b42c73b (diff)
parent3b167e3f0c64aceb9cef3b68bde548641be06b6e (diff)
Merge pull request #6822 from stangri/openwrt-22.03-luci-app-https-dns-proxy
[22.03] luci-app-https-dns-proxy: bugfix: editing providers with options
-rw-r--r--applications/luci-app-https-dns-proxy/Makefile2
-rw-r--r--applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js8
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile
index b0daecedf9..3e6209c137 100644
--- a/applications/luci-app-https-dns-proxy/Makefile
+++ b/applications/luci-app-https-dns-proxy/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
-PKG_VERSION:=2023-10-25-5
+PKG_VERSION:=2023-11-19-1
LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js
index a9bc25b905..253525fb4a 100644
--- a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js
+++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js
@@ -297,8 +297,8 @@ return view.extend({
section_id,
"resolver_url"
);
- if (_paramList.template !== template) return 0;
- let resolver = pkg.templateToResolver(template, {
+ if (!formvalue && _paramList.template !== template) return 0;
+ let resolver = pkg.templateToResolver(_paramList.template, {
option: formvalue || "",
});
L.uci.set(pkg.Name, section_id, "resolver_url", resolver);
@@ -335,8 +335,8 @@ return view.extend({
section_id,
"resolver_url"
);
- if (_paramText.template !== template) return 0;
- let resolver = pkg.templateToResolver(template, {
+ if (!formvalue && _paramText.template !== template) return 0;
+ let resolver = pkg.templateToResolver(_paramText.template, {
option: formvalue || "",
});
L.uci.set(pkg.Name, section_id, "resolver_url", resolver);