From e51580ea576b086a1b3849cd1745c1c6136ce555 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Thu, 16 Feb 2023 23:09:37 +0800 Subject: [PATCH] luci: move auto set dnsmasq option to basic settings --- .../files/luci/model/cbi/smartdns/smartdns.lua | 16 ++++++++-------- .../resources/view/smartdns/smartdns.js | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua index db8826b..7b8ccc5 100644 --- a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua +++ b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua @@ -56,6 +56,14 @@ o.default = 53 o.datatype = "port" o.rempty = false +-- Automatically Set Dnsmasq +o = s:taboption("settings", Flag, "auto_set_dnsmasq", translate("Automatically Set Dnsmasq"), translate("Automatically set as upstream of dnsmasq when port changes.")) +o.rmempty = false +o.default = o.enabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + ---- Speed check mode; o = s:taboption("advanced", Value, "speed_check_mode", translate("Speed Check Mode"), translate("Smartdns speed check mode.")); o.rmempty = true; @@ -187,14 +195,6 @@ o.cfgvalue = function(...) return Flag.cfgvalue(...) or "1" end --- Automatically Set Dnsmasq -o = s:taboption("advanced", Flag, "auto_set_dnsmasq", translate("Automatically Set Dnsmasq"), translate("Automatically set as upstream of dnsmasq when port changes.")) -o.rmempty = false -o.default = o.enabled -o.cfgvalue = function(...) - return Flag.cfgvalue(...) or "0" -end - -- Force AAAA SOA o = s:taboption("advanced", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA.")) o.rmempty = false diff --git a/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js b/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js index 4869733..08e4075 100644 --- a/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js +++ b/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js @@ -155,6 +155,11 @@ return view.extend({ o.default = 53; o.datatype = "port"; o.rempty = false; + + // auto-conf-dnsmasq; + o = s.taboption("settings", form.Flag, "auto_set_dnsmasq", _("Automatically Set Dnsmasq"), _("Automatically set as upstream of dnsmasq when port changes.")); + o.rmempty = false; + o.default = o.enabled; /////////////////////////////////////// // advanced settings; @@ -262,11 +267,6 @@ return view.extend({ o.rmempty = false; o.default = o.enabled; - // auto-conf-dnsmasq; - o = s.taboption("advanced", form.Flag, "auto_set_dnsmasq", _("Automatically Set Dnsmasq"), _("Automatically set as upstream of dnsmasq when port changes.")); - o.rmempty = false; - o.default = o.enabled; - // Force AAAA SOA o = s.taboption("advanced", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA.")); o.rmempty = false;