luci: 1.31

xiaorouji · Aug 27, 2024 · 8cbc6b9 · 8cbc6b9
1 parent 6fefad6
commit 8cbc6b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -60,7 +60,7 @@ body:
       label: 系统相关信息
       description: 填写相关信息以便更好的确定问题
       placeholder: |
-        - Passwall版本：
+        - Passwall2版本：
         - 浏览器版本（如Chrome 96.0.4664.45 64位 正式版）：
         - 其他：
     validations:

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=1.30-3
+PKG_VERSION:=1.31-1
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \

diff --git a/luci-app-passwall2/luasrc/controller/passwall2.lua b/luci-app-passwall2/luasrc/controller/passwall2.lua
@@ -22,9 +22,9 @@ function index()
 	entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true
 	local e
 	if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then
-		e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("PassWall 2"), -1)
+		e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("PassWall 2"), 0)
 	else
-		e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), nil, -1)
+		e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), nil, 0)
 	end
 	e.dependent = true
 	e.acl_depends = { "luci-app-passwall2" }

diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
@@ -337,8 +337,6 @@ for k, v in pairs(nodes_table) do
 		s.fields["remote_dns_client_ip"]:depends({ node = v.id, remote_dns_protocol = "tcp" })
 		s.fields["remote_dns_client_ip"]:depends({ node = v.id, remote_dns_protocol = "doh" })
 		s.fields["dns_hosts"]:depends({ node = v.id })
-	elseif v.type == "sing-box" then
-		s.fields["direct_dns_query_strategy"]:depends({ node = v.id })
 	end
 end