diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/acf-util/logon-controller.lua | 5 | ||||
| -rwxr-xr-x | app/acf-util/password-controller.lua | 5 | ||||
| -rw-r--r-- | app/acf-util/roles-controller.lua | 2 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 2 | ||||
| -rw-r--r-- | app/welcome-controller.lua | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index 61b4864..8dddb87 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -2,10 +2,7 @@ module (..., package.seeall) -mvc = {} -mvc.on_load = function(self, parent) - self.conf.default_action = "status" -end +default_action = "status" -- Logon a new user based upon id and password in clientdata logon = function(self) diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua index f891c58..fdcca8a 100755 --- a/app/acf-util/password-controller.lua +++ b/app/acf-util/password-controller.lua @@ -2,10 +2,7 @@ module(..., package.seeall) local auth=require("authenticator-plaintext") -mvc = {} -mvc.on_load = function(self, parent) - self.conf.default_action = "status" -end +default_action = "status" local function admin_permission() -- if (sessiondata.userinfo) and (sessiondata.userinfo.userid == "alpine") then diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua index 771c44e..b868924 100644 --- a/app/acf-util/roles-controller.lua +++ b/app/acf-util/roles-controller.lua @@ -2,6 +2,8 @@ module (..., package.seeall) +default_action = "read" + read = function(self) return ( { userid = self.sessiondata.userinfo.userid, roles = self.sessiondata.userinfo.roles, permissions = self.sessiondata.permissions } ) end diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 54cab87..9983293 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -11,7 +11,6 @@ module(..., package.seeall) -- require statements shouldn't need to go to the disk lib require "posix" - -- We use the parent exception handler in a last-case situation local parent_exception_handler @@ -73,7 +72,6 @@ mvc.on_load = function (self, parent) self.conf.appuri = "https://" .. ENV.HTTP_HOST .. ENV.SCRIPT_NAME self.conf.default_prefix = "/" self.conf.default_controller = "welcome" - self.conf.default_action = "read" self.clientdata = FORM self.conf.clientip = ENV.REMOTE_ADDR diff --git a/app/welcome-controller.lua b/app/welcome-controller.lua index 3ff5cc5..77735ec 100644 --- a/app/welcome-controller.lua +++ b/app/welcome-controller.lua @@ -1,6 +1,8 @@ -- A standin controller for testing module (..., package.seeall) +default_action = "read" + read = function (self ) return ( {self = self} ) end |