luci-0.9: merge r6009

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index f0e3e0a5efe8de59d618f7e53c3725786879fc89..cda2c10225540be2fb0495565803ecdf058ae7b3 100644 (file)
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -23,7 +23,7 @@ s.anonymous = false
 
 s:option(Flag, "enabled", translate("enable"))
 
-svc = s:option(Value, "service_name", translate("service"))
+svc = s:option(ListValue, "service_name", translate("service"))
 svc.rmempty = true
 
 local services = { }
@@ -43,6 +43,8 @@ for _, v in luci.util.vspairs(services) do
        svc:value(v)
 end
 
+svc:value("", translate("cbi_manual"))
+
 
 s:option(Value, "domain", translate("hostname")).rmempty = true
 s:option(Value, "username", translate("username")).rmempty = true
@@ -77,10 +79,11 @@ else
        web = s:option(Value, "ip_url", "URL")
        web:depends("ip_source", "web")
        web.rmempty = true
-
-       s:option(Value, "update_url").optional = true
 end
 
+url = s:option(Value, "update_url")
+url:depends("service_name", "")
+url.rmempty = true
 
 s:option(Value, "check_interval").default = 10
 unit = s:option(ListValue, "check_unit")