diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:19:05 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-04-18 01:19:05 +0000 |
| commit | 79cfe4b373abc872c856c180fef53da80cd800e0 (patch) | |
| tree | 0ed9e5548512aafa55d763fac646beed22eada02 | |
| parent | 56d2e632163109dca36c4c7e17a26c1379d678eb (diff) | |
| download | acf-gross-79cfe4b373abc872c856c180fef53da80cd800e0.tar.bz2 acf-gross-79cfe4b373abc872c856c180fef53da80cd800e0.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 and deleted view
Updated for viewfunctions to htmlviewfunctions and modified require statements for acf libraries
| -rw-r--r-- | gross-controller.lua | 7 | ||||
| -rw-r--r-- | gross-details-html.lsp | 4 | ||||
| -rw-r--r-- | gross-logfile-html.lsp | 1 | ||||
| -rw-r--r-- | gross-model.lua | 12 | ||||
| l--------- | gross-startstop-html.lsp | 1 |
5 files changed, 12 insertions, 13 deletions
diff --git a/gross-controller.lua b/gross-controller.lua index feb91dc..bce4c6c 100644 --- a/gross-controller.lua +++ b/gross-controller.lua @@ -1,8 +1,5 @@ module(..., package.seeall) --- Load libraries -require("controllerfunctions") - default_action = "status" function status(self) @@ -10,7 +7,7 @@ function status(self) 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 details(self) @@ -18,5 +15,5 @@ function details(self) end function expert(self) - return controllerfunctions.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Gross Config", "Configuration Set") + return self.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Gross Config", "Configuration Set") end diff --git a/gross-details-html.lsp b/gross-details-html.lsp index 8f1363e..ae142cd 100644 --- a/gross-details-html.lsp +++ b/gross-details-html.lsp @@ -1,5 +1,5 @@ <% local data, viewlibrary = ... -require("viewfunctions") +require("htmlviewfunctions") %> <% viewlibrary.dispatch_component("status") %> @@ -7,6 +7,6 @@ require("viewfunctions") <H2><%= html.html_escape(data.label) %></H2> <DL> <% -displayitem(data) +htmlviewfunctions.displayitem(data) %> </DL> diff --git a/gross-logfile-html.lsp b/gross-logfile-html.lsp index 7287262..3972075 100644 --- a/gross-logfile-html.lsp +++ b/gross-logfile-html.lsp @@ -1,5 +1,4 @@ <% local data, viewlibrary = ... -require("viewfunctions") %> <% if viewlibrary and viewlibrary.dispatch_component then diff --git a/gross-model.lua b/gross-model.lua index c18fdcd..d70af78 100644 --- a/gross-model.lua +++ b/gross-model.lua @@ -2,8 +2,8 @@ module(..., package.seeall) -- Load libraries require("modelfunctions") -require("fs") -require("format") +fs = require("acf.fs") +format = require("acf.format") -- Set variables local configfile = "/etc/grossd.conf" @@ -18,8 +18,12 @@ local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin -- ################################################################################ -- PUBLIC FUNCTIONS -function startstop_service(action) - return modelfunctions.startstop_service(processname, action) +function get_startstop(clientdata) + return modelfunctions.get_startstop(processname) +end + +function startstop_service(startstop, action) + return modelfunctions.startstop_service(startstop, action) end function getstatus() diff --git a/gross-startstop-html.lsp b/gross-startstop-html.lsp deleted file mode 120000 index 0ea2627..0000000 --- a/gross-startstop-html.lsp +++ /dev/null @@ -1 +0,0 @@ -../startstop-html.lsp
\ No newline at end of file |