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
commit496505602e6bcbdf0c316e62d5cf6c7880eabdf2 (patch)
tree4dec2ae01692ace06bac897b75bf715e5b92b9fa
parentef5c82c78eecaeba171337098cb260bc8e089b77 (diff)
downloadacf-rrdtool-496505602e6bcbdf0c316e62d5cf6c7880eabdf2.tar.bz2
acf-rrdtool-496505602e6bcbdf0c316e62d5cf6c7880eabdf2.tar.xz
Updated for handle_form now passing self to get and set functions
-rw-r--r--rrdtool-controller.lua4
-rw-r--r--rrdtool-model.lua16
2 files changed, 10 insertions, 10 deletions
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua
index aec0db2..3975e54 100644
--- a/rrdtool-controller.lua
+++ b/rrdtool-controller.lua
@@ -26,7 +26,7 @@ function listrrd(self)
end
function createrrd(self)
- return self.handle_form(self, self.model.createnewrrd, function(value)
+ return self.handle_form(self, self.model.createnewrrd, function(self, value)
return self.model.savenewrrd(self, value, sessiondata.userinfo.userid)
end, self.clientdata, "Save", "Create new RRD", "File saved")
end
@@ -62,7 +62,7 @@ end
function editgraphcfg(self)
config = self.handle_form(self,
function() return self.model.getgraphfile(self.clientdata.filename) end,
- function(value)
+ function(self, value)
return self.model.set_filedetails(self, value, sessiondata.userinfo.userid)
end, self.clientdata, "Save", "Edit Config File", "Config File Saved")
diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index 26a2e17..259bfa9 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -64,11 +64,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
@@ -80,8 +80,8 @@ function getconfigfile()
return modelfunctions.getfiledetails(configfile)
end
-function setconfigfile(filedetails)
- return modelfunctions.setfiledetails(filedetails, {configfile})
+function setconfigfile(self, filedetails)
+ return modelfunctions.setfiledetails(self, filedetails, {configfile})
end
function getrrdlist()
@@ -179,7 +179,7 @@ If you specify path, it should be " .. tostring(databases) .."/"
if not fs.is_dir(tostring(db_scripts)) then
fs.create_directory(tostring(db_scripts))
end
- filedetails = modelfunctions.setfiledetails(filedetails, getgraphlist)
+ filedetails = modelfunctions.setfiledetails(self, filedetails, getgraphlist)
filedetails = nil
local f = io.popen( cmd .. " 2>&1")
@@ -298,7 +298,7 @@ function set_filedetails (self, filedetails, userid)
filedetails.value.filename.value = filedetails.value.filename.value .. ".graph"
end
- filedetails = modelfunctions.setfiledetails(filedetails, getgraphlist)
+ filedetails = modelfunctions.setfiledetails(self, filedetails, getgraphlist)
else
filedetails.errtxt = "Failed to set file"
filedetails.value.filename.errtxt = "You need to specify a valid filename!"
@@ -308,6 +308,6 @@ function set_filedetails (self, filedetails, userid)
return filedetails
end
-function setgraphfile(filedetails,file)
- return modelfunctions.setfiledetails(filedetails, {file})
+function setgraphfile(self, filedetails, file)
+ return modelfunctions.setfiledetails(self, filedetails, {file})
end