diff options
author | Ted Trask <ttrask01@yahoo.com> | 2012-02-22 20:45:51 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2012-02-22 20:45:51 +0000 |
commit | 7a094cf04dd3fe002bf568e5bdbc29ddd833fb29 (patch) | |
tree | b1d0ef289fc3b6e562356884103b0b0009814dcf /lib | |
parent | 5dd6e6c5e5c6f5dc14315bae74e26421f1a9d197 (diff) | |
download | acf-core-7a094cf04dd3fe002bf568e5bdbc29ddd833fb29.tar.bz2 acf-core-7a094cf04dd3fe002bf568e5bdbc29ddd833fb29.tar.xz |
Changed startstop to be a standard form by creating two model functions and deleting the special controller function
Diffstat (limited to 'lib')
-rw-r--r-- | lib/controllerfunctions.lua | 7 | ||||
-rw-r--r-- | lib/modelfunctions.lua | 33 |
2 files changed, 20 insertions, 20 deletions
diff --git a/lib/controllerfunctions.lua b/lib/controllerfunctions.lua index ee10a14..b0879ae 100644 --- a/lib/controllerfunctions.lua +++ b/lib/controllerfunctions.lua @@ -97,10 +97,3 @@ function handle_form(self, getFunction, setFunction, clientdata, option, label, return form end - -function handle_startstop(self, startstopfunction, clientdata) - local result = startstopfunction(clientdata.action) - result.value.result = self:redirect_to_referrer(result.value.result) - return result -end - diff --git a/lib/modelfunctions.lua b/lib/modelfunctions.lua index 004a326..efc3693 100644 --- a/lib/modelfunctions.lua +++ b/lib/modelfunctions.lua @@ -18,24 +18,31 @@ function getenabled(processname) return result end -function startstop_service(servicename, action, actions) - local result = {} - actions = actions or {"Start", "Stop", "Restart"} - result.actions = cfe({ type="list", value=actions, label="Start/Stop actions" }) - - if action then +function get_startstop(servicename) + local service = cfe({ type="hidden", value=servicename, label="Service Name" }) + local actions, descr = processinfo.daemon_actions(servicename) + local errtxt + if not actions then + errtxt = descr + end + return cfe({ type="group", label="Management", value={servicename=service}, option=actions, errtxt=errtxt }) +end + +function startstop_service(startstop, action) + if not action then + startstop.errtxt = "Invalid Action" + else local reverseactions = {} - for i,act in ipairs(actions) do reverseactions[string.lower(act)] = i end - result.result = cfe({ label="Start/Stop result" }) + for i,act in ipairs(startstop.option) do reverseactions[string.lower(act)] = i end if reverseactions[string.lower(action)] then - local cmdresult, errtxt = processinfo.daemoncontrol(servicename, action) - result.result.value = cmdresult - result.result.errtxt = errtxt + local cmdresult, errtxt = processinfo.daemoncontrol(startstop.value.servicename.value, string.lower(action)) + startstop.descr = cmdresult + startstop.errtxt = errtxt else - result.result.errtxt = "Unknown command!" + startstop.errtxt = "Unknown command!" end end - return cfe({ type="group", value=result, label="Start/Stop result" }) + return startstop end function getstatus(processname, packagename, label, servicename) |