projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dff999e
)
luci-0.9: merge r5590, r5591 and r5592
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 25 Nov 2009 02:24:16 +0000
(
02:24
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 25 Nov 2009 02:24:16 +0000
(
02:24
+0000)
applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
patch
|
blob
|
history
applications/luci-splash/luasrc/model/cbi/splash/splash.lua
patch
|
blob
|
history
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
patch
|
blob
|
history
modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
patch
|
blob
|
history
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
81a0f65
..
46bd636
100644
(file)
--- 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 = m:section(TypedSection, "defaults")
s.anonymous = true
+s.addremove = false
s:option(Flag, "syn_flood")
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
e9d000f
..
145b16d
100644
(file)
--- 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")
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")
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
8fd5368
..
0d0ce2c
100644
(file)
--- 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 = 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
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
04ec1e1
..
7977778
100644
(file)
--- 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 = m:section(TypedSection, "dnsmasq", translate("settings"))
s.anonymous = true
+s.addremove = false
s:option(Flag, "domainneeded")
s:option(Flag, "authoritative")
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
s:option(Value, "tftp_root").optional = true
s:option(Value, "dhcp_boot").optional = true
-return m
\ No newline at end of file
+return m