Merge ssh://git.alpinelinux.org/gitroot/zelebar/acf-apk-tools

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