From 2ece009273252437281c8cc0b84ba2ec49e5d07c Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Oct 2013 19:07:53 +0000 Subject: Remove all calls to 'module' in preparation for move to Lua 5.2 Use mymodule parameter for module definition. This was also helpful in revealing places where the code relied on the global environment. --- interfaces-controller.lua | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'interfaces-controller.lua') diff --git a/interfaces-controller.lua b/interfaces-controller.lua index 6e72160..592c0b8 100644 --- a/interfaces-controller.lua +++ b/interfaces-controller.lua @@ -1,41 +1,43 @@ -- the interfaces controller -module (..., package.seeall) +local mymodule = {} -default_action = "read" +mymodule.default_action = "read" -status = function (self) +mymodule.status = function (self) return self.model.get_status() end -read = function (self) +mymodule.read = function (self) return self.model.get_all_interfaces() end -update = function(self) +mymodule.update = function(self) 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) +mymodule.delete = function(self) return self.handle_form(self, self.model.get_delete_iface_by_name, self.model.delete_iface_by_name, self.clientdata, "Delete", "Delete Interface") end -ifup = function(self) +mymodule.ifup = function(self) return self.handle_form(self, self.model.get_ifup_by_name, self.model.ifup_by_name, self.clientdata, "ifup", "Interface Up") end -ifdown = function(self) +mymodule.ifdown = function(self) return self.handle_form(self, self.model.get_ifdown_by_name, self.model.ifdown_by_name, self.clientdata, "ifdown", "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) +mymodule.create = function(self) return self.handle_form(self, self.model.get_iface, self.model.create_iface, self.clientdata, "Create", "Create Interface", "Interface created") end -editintfile = function(self) +mymodule.editintfile = function(self) 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) +mymodule.restart = function(self) return self.handle_form(self, self.model.get_restartnetworking, self.model.restartnetworking, self.clientdata, "Restart", "Restart Networking") end + +return mymodule -- cgit v1.2.3