diff options
author | Ted Trask <ttrask01@yahoo.com> | 2012-04-19 12:46:20 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2012-04-19 12:46:20 +0000 |
commit | b729270c2e5135cf1e0063d16df34350af95cdf6 (patch) | |
tree | 63db9f0e2d6bb8c2644fa631408bddd4f98ba710 /app | |
parent | 8e27cd0b719015f206e4d64355d045ff22ee096f (diff) | |
download | acf-core-b729270c2e5135cf1e0063d16df34350af95cdf6.tar.bz2 acf-core-b729270c2e5135cf1e0063d16df34350af95cdf6.tar.xz |
Updated password to remove redirect_to_referrer and password-html view
Diffstat (limited to 'app')
-rw-r--r-- | app/acf-util/password-controller.lua | 6 | ||||
-rw-r--r-- | app/acf-util/password-html.lsp | 16 | ||||
-rw-r--r-- | app/acf-util/password-model.lua | 33 |
3 files changed, 25 insertions, 30 deletions
diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua index 336f6f4..5ff8145 100644 --- a/app/acf-util/password-controller.lua +++ b/app/acf-util/password-controller.lua @@ -72,5 +72,9 @@ function newuser(self) end function deleteuser(self) - return self:redirect_to_referrer(self.model.delete_user(self, self.clientdata.userid)) + return self.handle_form(self, function() + return self.model.get_delete_user(self, self.clientdata.userid) + end, function(value) + return self.model.delete_user(self, value) + end, self.clientdata, "Delete", "Delete User", "Deleted user") end diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp deleted file mode 100644 index bc50fb7..0000000 --- a/app/acf-util/password-html.lsp +++ /dev/null @@ -1,16 +0,0 @@ -<% local form, viewlibrary, pageinfo = ... %> -<% require("htmlviewfunctions") %> - -<H1><%= html.html_escape(form.label) %></H1> -<% - if form.value.password and form.value.password_confirm then - form.value.password.type = "password" - form.value.password_confirm.type = "password" - end - -- If not in newuser action, disable userid - if pageinfo.action ~= "newuser" then - form.value.userid.readonly = true - end - local order = { "userid", "username", "roles", "password", "password_confirm" } - htmlviewfunctions.displayform(form, order) -%> diff --git a/app/acf-util/password-model.lua b/app/acf-util/password-model.lua index e9e0cd6..2a76c99 100644 --- a/app/acf-util/password-model.lua +++ b/app/acf-util/password-model.lua @@ -88,7 +88,10 @@ end function read_user(self, user) local result = {} - result.userid = cfe({ value=user, label="User id" }) + result.userid = cfe({ value=user, label="User id", seq=1 }) + if user and user ~= "" then + result.userid.readonly = true + end local userinfo = {} if not user then @@ -138,12 +141,12 @@ function read_user(self, user) end -- Passwords are set to empty string - result.username = cfe({ value=userinfo.username or "", label="Real name" }) - result.password = cfe({ value="", label="Password" }) - result.password_confirm = cfe({ value="", label="Password (confirm)" }) - result.roles = cfe({ type="multi", value=userinfo.roles or {}, label="Roles", option=avail_roles or {} }) - result.skin = cfe({ type="select", value=userinfo.skin or "", label="Skin", option=avail_skins or {""} }) - result.home = cfe({ type="select", value=userinfo.home or "", label="Home", option=avail_homes or {""} }) + result.username = cfe({ value=userinfo.username or "", label="Real name", seq=2 }) + result.password = cfe({ type="password", value="", label="Password", seq=4 }) + result.password_confirm = cfe({ type="password", value="", label="Password (confirm)", seq=5 }) + result.roles = cfe({ type="multi", value=userinfo.roles or {}, label="Roles", option=avail_roles or {}, seq=3 }) + result.skin = cfe({ type="select", value=userinfo.skin or "", label="Skin", option=avail_skins or {""}, seq=7 }) + result.home = cfe({ type="select", value=userinfo.home or "", label="Home", option=avail_homes or {""}, seq=6 }) return cfe({ type="group", value=result, label="User Config" }) end @@ -161,11 +164,15 @@ function get_users(self) return cfe({ type="group", value=users, label="User Configs" }) end -function delete_user(self, userid) - result = cfe({ label="Delete user result", errtxt="Failed to delete user"}) - if authenticator.delete_user(self, userid) then - result.value = "User deleted" - result.errtxt = nil +function get_delete_user(self, user) + local userid = cfe({ label="User id", value=user or "" }) + return cfe({ type="group", value={userid=userid}, label="Delete User" }) +end + +function delete_user(self, deleteuser) + deleteuser.errtxt = "Failed to delete user" + if authenticator.delete_user(self, deleteuser.value.userid.value) then + deleteuser.errtxt = nil end - return result + return deleteuser end |