From 7429b91e4b6f4223c24413d1889cda713a17e0ee Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 1 Jan 2009 14:33:36 +0000 Subject: [PATCH] branches/luci-0.8: backport wifi and olsr fixes rags/0.8.3: backport wifi and olsr fixes --- applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua | 4 +++- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua index 6a498a5b2..a0d6a2357 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua @@ -26,6 +26,7 @@ if arg[1] then ign = p:option(Flag, "ignore", "Enable") ign.enabled = "0" ign.disabled = "1" + ign.rmempty = false function ign.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end @@ -230,8 +231,9 @@ else end ign = t:option( Flag, "ignore", "Enabled" ) - ign.enabled = "0" + ign.enabled = "0" ign.disabled = "1" + ign.rmempty = false function ign.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua index b64190bc0..0ed725b61 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -72,7 +72,7 @@ if hwtype == "atheros" then mode:value("11adt", "802.11adt") mode:value("fh", translate("wifi_fh")) - s:option(Flag, "diversity", translate("wifi_diversity")) + s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false if not nsantenna then s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true -- 2.25.1