diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:54:35 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:54:35 +0000 |
| commit | ef5c82c78eecaeba171337098cb260bc8e089b77 (patch) | |
| tree | ea56c0469ea179a06810d7e552cf5b93fed2b4b9 /rrdtool-controller.lua | |
| parent | ab1ed27748958792d7e12500311ba62eb15b596b (diff) | |
| download | acf-rrdtool-ef5c82c78eecaeba171337098cb260bc8e089b77.tar.bz2 acf-rrdtool-ef5c82c78eecaeba171337098cb260bc8e089b77.tar.xz | |
Started work on updating for acf-core-0.15
Removed controllerfunctions library (still needs more work and corresponding work in model)
Updated startstop functionality
Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries
Diffstat (limited to 'rrdtool-controller.lua')
| -rw-r--r-- | rrdtool-controller.lua | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua index 8fbdab5..aec0db2 100644 --- a/rrdtool-controller.lua +++ b/rrdtool-controller.lua @@ -1,8 +1,5 @@ module(..., package.seeall) --- Load libraries -require("controllerfunctions") - default_action = "status" function status(self) @@ -10,15 +7,15 @@ function status(self) end function config(self) - return controllerfunctions.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Saved") + return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Saved") end function startstop(self) - return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata) + return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end function expert(self) - return controllerfunctions.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved") + return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved") end function listrrd(self) @@ -29,7 +26,7 @@ function listrrd(self) end function createrrd(self) - return controllerfunctions.handle_form(self, self.model.createnewrrd, function(value) + return self.handle_form(self, self.model.createnewrrd, function(value) return self.model.savenewrrd(self, value, sessiondata.userinfo.userid) end, self.clientdata, "Save", "Create new RRD", "File saved") end @@ -63,7 +60,7 @@ function config(self) end function editgraphcfg(self) - config = controllerfunctions.handle_form(self, + config = self.handle_form(self, function() return self.model.getgraphfile(self.clientdata.filename) end, function(value) return self.model.set_filedetails(self, value, sessiondata.userinfo.userid) |