From bc24a0656cd37dc39b28e30bbb4087f3c1af577d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 12 Oct 2026 18:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=81=20Sync=202026-10-12=2018:45:34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htdocs/luci-static/resources/view/wizard/initsetup.js | 4 ++-- my-default-settings/Makefile | 2 +- .../files/usr/lib/lua/luci}/controller/wizard.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename {luci-app-wizard/luasrc => my-default-settings/files/usr/lib/lua/luci}/controller/wizard.lua (97%) diff --git a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js index aa18812ae..99f5c208d 100644 --- a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js +++ b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js @@ -135,7 +135,7 @@ return view.extend({ ipv6: uci.get('network', 'wan6', 'auto') === '0' ? '0' : '1', https: uci.get('wizard', 'default', 'https') || '0', cookie_p: uci.get('wizard', 'default', 'persistent_cookies') || '1', - landing_page: uci.get('wizard', 'default', 'landing_page') || 'auto', + landing_page: uci.get('luci', 'main', 'landing_page') || 'auto', autoupgrade_fm: uci.get('wizard', 'default', 'autoupgrade_fm') || '0', coremark: uci.get('wizard', 'default', 'coremark') || '0', wifi_ssid: baseSsid || (this.hasWireless ? 'Kwrt' : ''), @@ -485,7 +485,7 @@ return view.extend({ uci.set('wizard', 'default', 'persistent_cookies', cur.cookie_p); } if (has(changed, 'landing_page')) { - uci.set('wizard', 'default', 'landing_page', cur.landing_page); + uci.set('luci', 'main', 'landing_page', cur.landing_page); } // J. 向导专属项（完整保留 autoupgrade_fm 与 coremark） diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile index 79aeef54f..9ac5759f3 100644 --- a/my-default-settings/Makefile +++ b/my-default-settings/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=my-default-settings PKG_VERSION:=2 -PKG_RELEASE:=33 +PKG_RELEASE:=34 include $(INCLUDE_DIR)/package.mk diff --git a/luci-app-wizard/luasrc/controller/wizard.lua b/my-default-settings/files/usr/lib/lua/luci/controller/wizard.lua similarity index 97% rename from luci-app-wizard/luasrc/controller/wizard.lua rename to my-default-settings/files/usr/lib/lua/luci/controller/wizard.lua index 458419cfa..fba8b8180 100644 --- a/luci-app-wizard/luasrc/controller/wizard.lua +++ b/my-default-settings/files/usr/lib/lua/luci/controller/wizard.lua @@ -29,7 +29,7 @@ end function landing_page() local uci = luci.model.uci.cursor() - local page = uci:get("wizard", "default", "landing_page") + local page = uci:get("luci", "main", "landing_page") local target = {"admin", "status", "overview"} -- 1. 默认/自动模式