summaryrefslogtreecommitdiffstats
path: root/apk-controller.lua
diff options
context:
space:
mode:
Diffstat (limited to 'apk-controller.lua')
-rw-r--r--apk-controller.lua38
1 files changed, 5 insertions, 33 deletions
diff --git a/apk-controller.lua b/apk-controller.lua
index 9bb53bb..9876347 100644
--- a/apk-controller.lua
+++ b/apk-controller.lua
@@ -1,4 +1,5 @@
-- the interfaces controller
+require("controllerfunctions")
module (..., package.seeall)
@@ -9,11 +10,7 @@ read = function(self)
end
loaded = function(self)
- -- Get command result out of session data
- local cmdresult = self.sessiondata.cmdresult
- self.sessiondata.cmdresult = nil
- local loaded = self.model.get_loaded_packages()
- return cfe({ type="group", value={loaded=loaded, cmdresult=cmdresult} })
+ return cfe({ type="group", value={loaded=self.model.get_loaded_packages()} })
end
available = function(self)
@@ -21,38 +18,13 @@ available = function(self)
end
delete = function(self)
- local package = self.clientdata.package or ""
- local cmdresult = self.model.delete_package(package, self.sessiondata)
- -- Put the result in session data and redirect
- self.sessiondata.cmdresult = cmdresult
- redirect(self)
+ return self:redirect_to_referrer(self.model.delete_package(self.clientdata.package or "", self.sessiondata))
end
install = function(self)
- local package = self.clientdata.package or ""
- local cmdresult = self.model.install_package(package, self.sessiondata)
- -- Put the result in session data and redirect
- self.sessiondata.cmdresult = cmdresult
- redirect(self)
+ return self:redirect_to_referrer(self.model.install_package(self.clientdata.package or "", self.sessiondata))
end
config = function(self)
- local config = self.model.get_config()
- if self.clientdata.Save then
- for name,value in pairs(config.value) do
- if self.clientdata[name] then
- value.value = self.clientdata[name]
- end
- end
- config = self.model.set_config(config)
- if not config.errtxt then
- config.descr = "Saved Configuration"
- end
- end
-
- config.type = "form"
- config.option = "Save"
- config.label = "Edit Configuration"
-
- return config
+ return controllerfunctions.handle_form(self, self.model.get_config, self.model.set_config, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
end