modules/admin-full: fix backup section cutoff in system page if rdate is nil (#242)

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_system / system.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index dcd2fb0..4fe10d0 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -75,7 +75,7 @@ s:taboption("general", DummyValue, "_uptime", translate("Uptime")).value =
  luci.tools.webadmin.date_format(tonumber(uptime))
 
 hn = s:taboption("general", Value, "hostname", translate("Hostname"))
-
+hn.datatype = "hostname"
 function hn.write(self, section, value)
        Value.write(self, section, value)
        luci.sys.hostname(value)
@@ -184,11 +184,26 @@ end
 --
 
 if has_rdate then
-       s2 = m:section(TypedSection, "rdate", translate("Time Server (rdate)"))
-       s2.anonymous = true
-       s2.addremove = false
-
-       s2:option(DynamicList, "server", translate("Server"))
+       m3= Map("timeserver", translate("Time Server (rdate)"))
+       s = m3:section(TypedSection, "timeserver")
+       s.anonymous = true
+       s.addremove = true
+       s.template = "cbi/tblsection"
+
+       h = s:option(Value, "hostname", translate("Name"))
+       h.rmempty = true
+       h.datatype = host
+       i = s:option(ListValue, "interface", translate("Interface"))
+       i.rmempty = true
+       i:value("", translate("Default"))
+       m3.uci:foreach("network", "interface",
+               function (section)
+                       local ifc = section[".name"]
+                       if ifc ~= "loopback" then
+                               i:value(ifc)
+                       end
+               end
+       )
 end
 
 
@@ -249,4 +264,4 @@ c.write = function(self, section, value)
 end
 
 
-return m, m2
+return m, m3 or m2, m3 and m2