From f0e63629cbc6945e78eca4b6ead7fa4e87d65cc3 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 25 Nov 2009 02:24:16 +0000 Subject: [PATCH] luci-0.9: merge r5590, r5591 and r5592 --- applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua | 1 + applications/luci-splash/luasrc/model/cbi/splash/splash.lua | 2 ++ modules/admin-full/luasrc/model/cbi/admin_network/network.lua | 1 + modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua index 81a0f65cf..46bd636b2 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua @@ -16,6 +16,7 @@ m = Map("firewall", translate("fw_fw"), translate("fw_fw1")) s = m:section(TypedSection, "defaults") s.anonymous = true +s.addremove = false s:option(Flag, "syn_flood") diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua b/applications/luci-splash/luasrc/model/cbi/splash/splash.lua index e9d000f0d..145b16d5b 100644 --- a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua +++ b/applications/luci-splash/luasrc/model/cbi/splash/splash.lua @@ -4,6 +4,8 @@ require("luci.model.uci") m = Map("luci_splash", "Client-Splash", [[Client-Splash ist das Freifunk Hotspot-Authentifizierungs-System.]]) s = m:section(NamedSection, "general", "core", "Allgemein") +s.addremove = false + s:option(Value, "leasetime", "Freigabezeit", "h") s:option(Value, "limit_up", "Upload-Limitierung", "Kilobyte/s - limitiert die Upload-Geschwindigkeit von Clients") diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua index 8fd536888..0d0ce2c9a 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua @@ -25,6 +25,7 @@ local netstat = sys.net.deviceinfo() s = m:section(TypedSection, "interface", "") s.addremove = true +s.anonymous = false s.extedit = luci.dispatcher.build_url("admin", "network", "network") .. "/%s" s.template = "cbi/tblsection" s.override_scheme = true diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua index 04ec1e15c..797777865 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua @@ -15,6 +15,7 @@ m = Map("dhcp", "Dnsmasq") s = m:section(TypedSection, "dnsmasq", translate("settings")) s.anonymous = true +s.addremove = false s:option(Flag, "domainneeded") s:option(Flag, "authoritative") @@ -42,4 +43,4 @@ s:option(Flag, "enable_tftp").optional = true s:option(Value, "tftp_root").optional = true s:option(Value, "dhcp_boot").optional = true -return m \ No newline at end of file +return m -- 2.25.1