From 0874f88bc25066248c28b16d3bbf1ab5cd1f2611 Mon Sep 17 00:00:00 2001 From: Zach LeBar Date: Wed, 21 Mar 2012 15:06:32 +0000 Subject: Change all -controller.lua files to use new handle_form() functions found in acf_www-controller.lua instead of the controllerfunctions.lua version and also instead of redirect_to_referrer(). Made corresponding changes to vmail-model .lua to make everything work. --- interfaces-controller.lua | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'interfaces-controller.lua') diff --git a/interfaces-controller.lua b/interfaces-controller.lua index 02b2a3c..c27b732 100644 --- a/interfaces-controller.lua +++ b/interfaces-controller.lua @@ -1,6 +1,4 @@ -- the interfaces controller -require("controllerfunctions") - module (..., package.seeall) default_action = "read" @@ -14,29 +12,30 @@ read = function (self) end update = function(self) - return controllerfunctions.handle_form(self, function() return self.model.get_iface_by_name(self.clientdata.name or "") end, self.model.update_iface, self.clientdata, "Save", "Update Interface", "Interface updated") + return self.handle_form(self, self.model.get_iface_by_name, self.model.update_iface, self.clientdata, "Save", "Update Interface", "Interface updated") end delete = function(self) - return self:redirect_to_referrer(self.model.delete_iface_by_name(self.clientdata.name or "")) + return self.handle_form(self, self.model.get_delete_iface_by_name, self.model.delete_iface_by_name, self.clientdata, "Delete", "Delete Interface", "Interface deleted") end ifup = function(self) - return self:redirect_to_referrer(self.model.ifup_by_name(self.clientdata.name or "")) + return self.handle_form(self, self.model.get_ifup_by_name, self.model.ifup_by_name, self.clientdata, "ifup", "Interface Up", "Interface up") end ifdown = function(self) - return self:redirect_to_referrer(self.model.ifdown_by_name(self.clientdata.name or "")) + return self.handle_form(self, self.model.get_ifdown_by_name, self.model.ifdown_by_name, self.clientdata, "ifdown", "Interface Down", "Interface down") end +-- FIXME: 'Method' select box appeared via JS ... figure out how best to implement that when using the standard view create = function(self) - return controllerfunctions.handle_form(self, function() return self.model.get_iface(self.clientdata.family, self.clientdata.method) end, self.model.create_iface, self.clientdata, "Create", "Create Interface", "Interface created") + return self.handle_form(self, self.model.get_iface, self.model.create_iface, self.clientdata, "Create", "Create Interface", "Interface created") end editintfile = function(self) - return controllerfunctions.handle_form(self, self.model.get_file, self.model.write_file, self.clientdata, "Save", "Edit Interfaces file", "File saved") + return self.handle_form(self, self.model.get_file, self.model.write_file, self.clientdata, "Save", "Edit Interfaces file", "File saved") end restart = function(self) - return self:redirect_to_referrer(self.model.restartnetworking()) + return self.handle_form(self, self.model.get_restartnetworking, self.model.restartnetworking, self.clientdata, "Restart", "Restart Networking") end -- cgit v1.2.3