1c09ee5e42
When a value identical to the stored one is submitted, the CBI framework will not emit an option write event and therfore not store the value in the form data dictionary passed to SimpleForm.handle(). This usage pattern usally works be accident for file editor views such as admin_system/crontab because \r\n windows style line endings are substituted with unix \n ones before writing the data, defeating the equality check in CBI. When a single line without trailing newline is submitted however, the CBI will not see a difference to the data stored in the file and clear out the value on subsequent saves. This commit alignes the logic used by various SimpleForm views to behave identically and predictable: - File data is handled in the SimpleForm.handle() callback - The forcewrite property is used to disable equality checks - Submission of an empty string empties the backing file Fixes: #2737 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
33 lines
918 B
Lua
33 lines
918 B
Lua
-- Copyright 2008 Steven Barth <steven@midlink.org>
|
|
-- Copyright 2008-2013 Jo-Philipp Wich <jow@openwrt.org>
|
|
-- Licensed to the public under the Apache License 2.0.
|
|
|
|
local fs = require "nixio.fs"
|
|
local cronfile = "/etc/crontabs/root"
|
|
|
|
f = SimpleForm("crontab", translate("Scheduled Tasks"),
|
|
translate("This is the system crontab in which scheduled tasks can be defined.") ..
|
|
translate("<br/>Note: you need to manually restart the cron service if the " ..
|
|
"crontab file was empty before editing."))
|
|
|
|
t = f:field(TextValue, "crons")
|
|
f.forcewrite = true
|
|
t.rmempty = true
|
|
t.rows = 10
|
|
function t.cfgvalue()
|
|
return fs.readfile(cronfile) or ""
|
|
end
|
|
|
|
function f.handle(self, state, data)
|
|
if state == FORM_VALID then
|
|
if data.crons then
|
|
fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
|
|
luci.sys.call("/usr/bin/crontab %q" % cronfile)
|
|
else
|
|
fs.writefile(cronfile, "")
|
|
end
|
|
end
|
|
return true
|
|
end
|
|
|
|
return f
|