diff options
Diffstat (limited to 'did-controller.lua')
| -rw-r--r-- | did-controller.lua | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/did-controller.lua b/did-controller.lua index 2ff5da3..a3ffd9d 100644 --- a/did-controller.lua +++ b/did-controller.lua @@ -1,8 +1,5 @@ module(..., package.seeall) --- Load libraries -require("controllerfunctions") - default_action = "viewrecords" function listuseddefinitions(self) @@ -36,7 +33,7 @@ local function handle_form(self, getFunction, setFunction, clientdata, option, l local form = getFunction() if clientdata["Save"] or clientdata["Test"] then - controllerfunctions.handle_clientdata(form, clientdata) + self.handle_clientdata(form, clientdata) if clientdata["Test"] then form = setFunction(form, true) @@ -86,11 +83,11 @@ end function assigndefinition(self) self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype - return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number") + return self.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number") end function newdefinition(self) - local retval = controllerfunctions.handle_form(self, self.model.getunuseddefinition, function(value) return self.model.setunuseddefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Select", "Create New DID Number") + local retval = self.handle_form(self, self.model.getunuseddefinition, function(value) return self.model.setunuseddefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Select", "Create New DID Number") if retval.value.did and not retval.errtxt then -- Successfully found an unused did, redirect to edit it self:redirect("editdefinition?did="..retval.value.did.value.."&redir=listdefinitions") @@ -115,7 +112,7 @@ function status(self) end function createdatabase(self) - return controllerfunctions.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created") + return self.handle_form(self, self.model.getnewdatabase, self.model.create_database, self.clientdata, "Create", "Create New Database", "Database Created") end function viewactivitylog(self) @@ -127,7 +124,7 @@ function listpermissions(self) end function edituserpermissions(self) - return controllerfunctions.handle_form(self, function() + return self.handle_form(self, function() return self.model:getuserpermissions(self.clientdata.userid) end, function(value) return self.model:setuserpermissions(value) @@ -135,7 +132,7 @@ function edituserpermissions(self) end function editrolepermissions(self) - return controllerfunctions.handle_form(self, function() + return self.handle_form(self, function() return self.model:getrolepermissions(self.clientdata.role) end, function(value) return self.model:setrolepermissions(value) |