Merge ssh://git.alpinelinux.org/gitroot/zelebar/acf-alpine-baselayout

1 files changed, 6 insertions, 8 deletions

diff --git a/cron-controller.lua b/cron-controller.lua
index a420cc9..8c40b13 100644
--- a/cron-controller.lua
+++ b/cron-controller.lua
@@ -1,8 +1,6 @@
 -- the cron controller
 module (..., package.seeall)
 
-require("controllerfunctions")
-
 default_action = "status"
 
 function status(self)
@@ -10,7 +8,7 @@ function status(self)
 end
 
 function startstop(self)
-	return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata)
+	return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
 end
 
 function listjobs(self)
@@ -18,21 +16,21 @@ function listjobs(self)
 end
 
 function editjob(self)
-	return controllerfunctions.handle_form(self, function() return self.model.read_job(self.clientdata.name) end, self.model.update_job, self.clientdata, "Save", "Edit Job", "Job Saved")
+	return self.handle_form(self, self.model.read_job, self.model.update_job, self.clientdata, "Save", "Edit Job", "Job Saved")
 end
 
 function deletejob(self)
-	return self:redirect_to_referrer(self.model.delete_job(self.clientdata.name))
+	return self.handle_form(self, self.model.get_delete_job, self.model.delete_job, self.clientdata, "Delete", "Delete Job", "Job Deleted")
 end
 
 function movejob(self)
-	return controllerfunctions.handle_form(self, self.model.get_move_job, self.model.move_job, self.clientdata, "Move", "Move Job", "Job Moved")
+	return self.handle_form(self, self.model.get_move_job, self.model.move_job, self.clientdata, "Move", "Move Job", "Job Moved")
 end
 
 function createjob(self)
-	return controllerfunctions.handle_form(self, self.model.create_new_job, self.model.create_job, self.clientdata, "Create", "Create New Job", "New Job Created")
+	return self.handle_form(self, self.model.create_new_job, self.model.create_job, self.clientdata, "Create", "Create New Job", "New Job Created")
 end
 
 function expert(self)
-	return controllerfunctions.handle_form(self, self.model.read_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config File", "Configuration Set")
+	return self.handle_form(self, self.model.read_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config File", "Configuration Set")
 end