From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 3 Apr 2010 13:55:23 +0000 (+0000)
Subject: luci-0.9: merge r6009
X-Git-Tag: 0.9.0~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6afee3fff73be43a5d510c927219e9cfd4520c24;p=oweals%2Fluci.git

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 f0e3e0a5e..cda2c1022 100644
--- 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")