Replaced all list_redir functions with redirect in mvc.lua, implemented a default_action string in each controller, removing the on_load functions

git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1037 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 3 insertions, 17 deletions

diff --git a/skins-controller.lua b/skins-controller.lua
index bf7a02a..9becde9 100644
--- a/skins-controller.lua
+++ b/skins-controller.lua
@@ -1,23 +1,9 @@
 module (..., package.seeall)
 
--- Cause an http redirect to our "read" action
--- We use the self.conf table because it already has prefix,controller,etc
--- The redir code is defined in the application error handler (acf-controller)
-local list_redir = function (self)
-	self.conf.action = "read"
-	self.conf.type = "redir"
-	error (self.conf)
-end
-
-mvc={}
-mvc.on_load = function(self, parent)
-	if (self.worker[self.conf.action] == nil ) or ( self.conf.action == "init" ) then
-		self.worker[self.conf.action] = list_redir(self)
-	end
-end
-
 -- Public methods
 
+default_action = "read"
+
 read = function (self )
 	return ({skin = self.model:get(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end
@@ -25,7 +11,7 @@ end
 update = function (self )
 	local newskin = self.clientdata.skin or ""
 	local updated = self.model:update(newskin)
-	list_redir(self)
+	redirect(self)
 --	return ({skin = self.model:get(), updated=self.model:update(newskin), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller} )
 end