summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-28 12:17:45 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-28 12:17:45 +0000
commit741579cc3f86ed6058c192ac5ae4c23a38002092 (patch)
tree440087bae4754736c00d19a6b9b981d8bae48169
parent4f4f76cfc6b94576ea6726fdf8fa3ba55d3562f8 (diff)
downloadacf-tinydns-741579cc3f86ed6058c192ac5ae4c23a38002092.tar.bz2
acf-tinydns-741579cc3f86ed6058c192ac5ae4c23a38002092.tar.xz
Updated for handle_form now passing self to get and set functions
-rw-r--r--tinydns-controller.lua14
-rw-r--r--tinydns-model.lua6
2 files changed, 8 insertions, 12 deletions
diff --git a/tinydns-controller.lua b/tinydns-controller.lua
index 25a0c12..54fa603 100644
--- a/tinydns-controller.lua
+++ b/tinydns-controller.lua
@@ -21,11 +21,11 @@ function startstop(self)
end
function config(self)
- return self.handle_form(self, self.model.getconfig, function(value) return self.model.setconfig(self, value) end, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
+ return self.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
end
function newfile(self)
- return self.handle_form(self, self.model.getnewconfigfile, function(value)
+ return self.handle_form(self, self.model.getnewconfigfile, function(self, value)
return self.model.createconfigfile(self, value, sessiondata.userinfo.userid)
end, self.clientdata, "Create", "Create New Config File", "Config File Created")
end
@@ -48,7 +48,7 @@ end
function editfile(self)
config = self.handle_form(self, function()
return self.model.get_filedetails(self, self.clientdata.filename, sessiondata.userinfo.userid)
- end, function(value)
+ end, function(self, value)
return self.model.set_filedetails(self, value, sessiondata.userinfo.userid)
end, self.clientdata, "Save", "Edit Config File", "Config File Saved")
@@ -69,15 +69,11 @@ end
function edituserpermissions(self)
return self.handle_form(self, function()
return self.model:getuserpermissions(self.clientdata.userid)
- end, function(value)
- return self.model:setuserpermissions(value)
- end, self.clientdata, "Save", "Edit User Permissions", "User permissions set")
+ end, self.model.setuserpermissions, self.clientdata, "Save", "Edit User Permissions", "User permissions set")
end
function editrolepermissions(self)
return self.handle_form(self, function()
return self.model:getrolepermissions(self.clientdata.role)
- end, function(value)
- return self.model:setrolepermissions(value)
- end, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set")
+ end, self.model.setrolepermissions, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set")
end
diff --git a/tinydns-model.lua b/tinydns-model.lua
index 3df68a3..82c2934 100644
--- a/tinydns-model.lua
+++ b/tinydns-model.lua
@@ -157,11 +157,11 @@ end
-- ################################################################################
-- PUBLIC FUNCTIONS
-function get_startstop(clientdata)
+function get_startstop(self, clientdata)
return modelfunctions.get_startstop(processname)
end
-function startstop_service(startstop, action)
+function startstop_service(self, startstop, action)
return modelfunctions.startstop_service(startstop, action)
end
@@ -280,7 +280,7 @@ end
function set_filedetails (self, filedetails, userid)
configfiles = searchforconfigfiles(self, userid)
- return modelfunctions.setfiledetails(filedetails, validfilename)
+ return modelfunctions.setfiledetails(self, filedetails, validfilename)
end
function getnewconfigfile()