From 0e5be0d68a9daac7d2b04f23bc1e18935cb80145 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 12 Sep 2019 18:48:58 +0200 Subject: luci-mod-system: reimplent system/crontab as client side view Signed-off-by: Jo-Philipp Wich --- .../luasrc/controller/admin/system.lua | 2 +- .../luasrc/model/cbi/admin_system/crontab.lua | 33 ---------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua (limited to 'modules/luci-mod-system/luasrc') diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua index c3e3678fd4..b9785994ad 100644 --- a/modules/luci-mod-system/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua @@ -22,7 +22,7 @@ function index() end entry({"admin", "system", "startup"}, view("system/startup"), _("Startup"), 45) - entry({"admin", "system", "crontab"}, form("admin_system/crontab"), _("Scheduled Tasks"), 46) + entry({"admin", "system", "crontab"}, view("system/crontab"), _("Scheduled Tasks"), 46) if fs.access("/sbin/block") and fs.access("/etc/config/fstab") then entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), _("Mount Points"), 50) diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua deleted file mode 100644 index beb24e7cae..0000000000 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008-2013 Jo-Philipp Wich --- 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("
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 -- cgit v1.2.3