From: Jo-Philipp Wich Date: Sat, 27 Mar 2010 02:41:29 +0000 (+0000) Subject: luci-0.9: merge r5940 X-Git-Tag: 0.9.0~31 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ce93183e25219d213999793aae3fa82e1e6a8e1f;p=project%2Fluci.git luci-0.9: merge r5940 --- diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua index 06609e3a0b..14e8758d82 100644 --- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua +++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua @@ -16,6 +16,7 @@ m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc")) s = m:section(TypedSection, "ntpclient", translate("general")) s.anonymous = true +s.addremove = false s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c") @@ -25,6 +26,8 @@ s:option(Value, "count", translate("ntpc_count"), translate("ntpc_count_desc")). s2 = m:section(TypedSection, "ntpdrift", translate("ntpc_drift")) s2.anonymous = true +s2.addremove = false + s2:option(Value, "freq", translate("ntpc_drift_freq")).rmempty = true @@ -36,4 +39,4 @@ s3.template = "cbi/tblsection" s3:option(Value, "hostname", translate("hostname")) s3:option(Value, "port", translate("port")).rmempty = true -return m \ No newline at end of file +return m diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua index 3493e03173..815e7a5443 100644 --- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua +++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua @@ -17,6 +17,7 @@ m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc")) s = m:section(TypedSection, "ntpclient", translate("general")) s.anonymous = true +s.addremove = false s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c") @@ -31,4 +32,4 @@ s3.template = "cbi/tblsection" s3:option(Value, "hostname", translate("hostname")) s3:option(Value, "port", translate("port")).rmempty = true -return m \ No newline at end of file +return m