diff options
author | Zach LeBar <zach@zachlebar.com> | 2012-03-22 20:08:30 +0000 |
---|---|---|
committer | Zach LeBar <zach@zachlebar.com> | 2012-03-22 20:08:30 +0000 |
commit | b1d62376783a9b449ad13c5000f35eaa9a87662c (patch) | |
tree | c16296229b41ce14626425843ebc3397b35c901b /apk-controller.lua | |
parent | d6df1a0c206b2f2f979f15b2619a6e221ff39019 (diff) | |
download | acf-apk-tools-b1d62376783a9b449ad13c5000f35eaa9a87662c.tar.bz2 acf-apk-tools-b1d62376783a9b449ad13c5000f35eaa9a87662c.tar.xz |
Changed apk-controller.lua to use new handle_form() functions found in acf_www-controller.lua instead of the controllerfunctions.lua version and also instead of redirect_to_referrer(). Made corresponding changes to apk-model.lua to make everything work.HEADmaster
Diffstat (limited to 'apk-controller.lua')
-rw-r--r-- | apk-controller.lua | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apk-controller.lua b/apk-controller.lua index eff4c8a..5945765 100644 --- a/apk-controller.lua +++ b/apk-controller.lua @@ -1,5 +1,4 @@ -- the interfaces controller -require("controllerfunctions") module (..., package.seeall) @@ -18,29 +17,29 @@ details = function(self) end delete = function(self) - return self:redirect_to_referrer(self.model.delete_package(self.clientdata.package or "", self.sessiondata)) + return self.handle_form(self, self.model.get_delete_package, self.model.delete_package, self.clientdata, "Delete", "Delete Package") end install = function(self) - return self:redirect_to_referrer(self.model.install_package(self.clientdata.package or "", self.sessiondata)) + return self.handle_form(self, self.model.get_install_package, self.model.install_package, self.clientdata, "Install", "Install Package") end upgrade = function(self) - return self:redirect_to_referrer(self.model.upgrade_package(self.clientdata.package or "", self.sessiondata)) + return self.handle_form(self, self.model.get_upgrade_package, self.model.upgrade_package, self.clientdata, "Upgrade", "Upgrade Package") end cache = function(self) - return controllerfunctions.handle_form(self, self.model.get_cache, self.model.update_cache, self.clientdata, "Save", "Edit Cache Settings", "Settings Saved") + return self.handle_form(self, self.model.get_cache, self.model.update_cache, self.clientdata, "Save", "Edit Cache Settings", "Settings Saved") end expert = function(self) - return controllerfunctions.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") + return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") end updateall = function(self) - return self:redirect_to_referrer(self.model.update_all()) + return self.handle_form(self, self.model.get_update_all, self.model.update_all, self.clientdata, "Update All", "Update All Packages") end upgradeall = function(self) - return self:redirect_to_referrer(self.model.upgrade_all()) + return self.handle_form(self, self.model.get_upgrade_all, self.model.upgrade_all, self.clientdata, "Upgrade All", "Upgrade All Packages") end |