summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-28 12:04:19 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-28 12:04:19 +0000
commitdac5c45138c101f5b399273f259faadda4f0dcf3 (patch)
treee4623dda5583e7a4f3d54ebb927d95b2402a902b
parent963d7e009e2d938296300756e08fc3816a2dee47 (diff)
downloadacf-did-dac5c45138c101f5b399273f259faadda4f0dcf3.tar.bz2
acf-did-dac5c45138c101f5b399273f259faadda4f0dcf3.tar.xz
Updated for handle_form now passing self to get and set functions
-rw-r--r--did-controller.lua10
-rw-r--r--did-model.lua2
2 files changed, 6 insertions, 6 deletions
diff --git a/did-controller.lua b/did-controller.lua
index a3ffd9d..3b61205 100644
--- a/did-controller.lua
+++ b/did-controller.lua
@@ -78,16 +78,16 @@ function editdefinitionextension(self)
end
function createdefinition(self)
- return handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid) end, function(...) return self.model.savedefinition(self, sessiondata.userinfo.userid, ...) end, self.clientdata, "Save", "Create DID Number")
+ return handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid) end, function(self, ...) return self.model.savedefinition(self, sessiondata.userinfo.userid, ...) end, self.clientdata, "Save", "Create DID Number")
end
function assigndefinition(self)
self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype
- 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")
+ return self.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(self, value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number")
end
function newdefinition(self)
- 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")
+ local retval = self.handle_form(self, self.model.getunuseddefinition, function(self, 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")
@@ -126,7 +126,7 @@ end
function edituserpermissions(self)
return self.handle_form(self, function()
return self.model:getuserpermissions(self.clientdata.userid)
- end, function(value)
+ end, function(self, value)
return self.model:setuserpermissions(value)
end, self.clientdata, "Save", "Edit User Permissions", "User permissions set")
end
@@ -134,7 +134,7 @@ end
function editrolepermissions(self)
return self.handle_form(self, function()
return self.model:getrolepermissions(self.clientdata.role)
- end, function(value)
+ end, function(self, value)
return self.model:setrolepermissions(value)
end, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set")
end
diff --git a/did-model.lua b/did-model.lua
index 0786c94..08b342d 100644
--- a/did-model.lua
+++ b/did-model.lua
@@ -1181,7 +1181,7 @@ function getnewdatabase()
return cfe({ type="group", value=database, label="Create Database", errtxt=errtxt })
end
-function create_database(database)
+function create_database(self, database)
local success = true
local errtxt