Make protocol selection in Firewall and QoS a combobox

closes #29

diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
index d8fe59c9bd1ff99c4c92c60186789b814ffed887..72a36f92712c62987c322498f6f4c1aaebf4e58a 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
@@ -39,7 +39,7 @@ luci.model.uci.cursor():foreach("firewall", "zone",
                oface:value(section.name)
        end)
 
-proto = s:option(ListValue, "proto", translate("protocol"))
+proto = s:option(Value, "proto", translate("protocol"))
 proto.optional = true
 proto:value("")
 proto:value("tcpudp", "TCP+UDP")

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index e051347ab23b6093dd064179128fd62c8213fb0f..707d98a7b206c43ff6434aff9d24c68b4b17d9b5 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -73,7 +73,7 @@ p2p:value("gnu", "Gnutella")
 p2p:value("kazaa", "Kazaa")
 p2p.rmempty = true
 
-p = s:option(ListValue, "proto", translate("protocol"))
+p = s:option(Value, "proto", translate("protocol"))
 p:value("", translate("all"))
 p:value("tcp", "TCP")
 p:value("udp", "UDP")