From 0d13dbbc43b7c48eb23246cf4f2c277cbb5942c3 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 10 Mar 2014 00:51:27 +0000 Subject: Modified HTML views to use new htmlviewfunctions functions and replace links with forms created by displayitem Use .displayitemstart/middle/end --- app/acf-util/password-status-html.lsp | 24 +++++++++++++----------- app/acf-util/roles-model.lua | 2 +- app/acf-util/roles-viewroles-html.lsp | 24 +++++++++++++++--------- app/filedetails-html.lsp | 3 +-- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp index 189cc63..cdb589d 100644 --- a/app/acf-util/password-status-html.lsp +++ b/app/acf-util/password-status-html.lsp @@ -6,15 +6,16 @@ <% local header_level = htmlviewfunctions.displayheader(form, page_info) -local newaccount = cfe({ type="link", value={}, label="Create New Account", option="Create", action=page_info.script..page_info.prefix..page_info.controller.."/newuser" }) -newaccount.value.redir = cfe({ type="hidden", value=page_info.orig_action }) -htmlviewfunctions.displayitem(newaccount, htmlviewfunctions.incrementheader(header_level), page_info) +header_level = htmlviewfunctions.incrementheader(header_level) +local redir = cfe({ type="hidden", value=page_info.orig_action }) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level, page_info) -htmlviewfunctions.displayheader(cfe({label="Existing Accounts"}), page_info, htmlviewfunctions.incrementheader(header_level)) +htmlviewfunctions.displayheader(cfe({label="Existing Accounts"}), page_info, header_level) for i,user in ipairs(form.value) do - local name = html.html_escape(user.value.userid.value) %> -

<%= name %>

-
+ local name = html.html_escape(user.value.userid.value) + htmlviewfunctions.displayitemstart() %> + <%= name %> + <% htmlviewfunctions.displayitemmiddle() %> @@ -28,11 +29,12 @@ for i,user in ipairs(form.value) do
<%= html.html_escape(user.value.userid.label) %>
Option - [Edit this account] - [Delete this account] - [View roles for this account] + <% local userid = cfe({type="hidden", value=user.value.userid.value}) %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituser"}), -1, page_info) %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={userid=userid}, label="", option="Delete", action="deleteuser" }), -1, page_info) %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid}, label="", option="View Roles", action=page_info.script.."/acf-util/roles/viewuserroles"}), -1, page_info) %>
-
+ <% htmlviewfunctions.displayitemend() %> <% end %> diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua index fc2634a..943e786 100644 --- a/app/acf-util/roles-model.lua +++ b/app/acf-util/roles-model.lua @@ -10,7 +10,7 @@ mymodule.get_user_roles = function(self, userid) local userinfo = authenticator.get_userinfo(self, userid) or {} rls = cfe({ type="list", value=userinfo.roles or {}, label="Roles" }) permissions = cfe({ type="table", value=roles.get_roles_perm(self, rls.value), label="Permissions" }) - return cfe({ type="group", value={roles=rls, permissions=permissions} }) + return cfe({ type="group", value={roles=rls, permissions=permissions}, label="Roles/Permission list for "..userid }) end -- Return permissions for specified role diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp index 383dd57..32593a4 100644 --- a/app/acf-util/roles-viewroles-html.lsp +++ b/app/acf-util/roles-viewroles-html.lsp @@ -24,11 +24,11 @@ <% local header_level = htmlviewfunctions.displayheader(view, page_info) -local newrole = cfe({ type="link", value={}, label="Create New Role", option="Create", action=page_info.script..page_info.prefix..page_info.controller.."/newrole" }) -newrole.value.redir = cfe({ type="hidden", value=page_info.orig_action }) -htmlviewfunctions.displayitem(newrole, htmlviewfunctions.incrementheader(header_level), page_info) +header_level = htmlviewfunctions.incrementheader(header_level) +local redir = cfe({ type="hidden", value=page_info.orig_action }) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level, page_info) -htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlviewfunctions.incrementheader(header_level)) +htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header_level) %> @@ -37,9 +37,12 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlvi <% for x,role in pairs(view.value.defined_roles.value) do %> <% end %> <% end %> @@ -47,8 +50,11 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlvi <% for x,role in pairs(view.value.default_roles.value) do %> <% end %> <% end %> diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp index 3116722..fd0d8dd 100644 --- a/app/filedetails-html.lsp +++ b/app/filedetails-html.lsp @@ -25,8 +25,7 @@ end <% htmlviewfunctions.displayheader(cfe({label="File Content"}), page_info, header_level) if form.type == "form" then - form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action - htmlviewfunctions.displayformstart(form) + htmlviewfunctions.displayformstart(form, page_info) form.value.filename.type = "hidden" htmlviewfunctions.displayformitem(form.value.filename) end -- cgit v1.2.3
RoleAction
<%= html.html_escape(role) %> - [View this role] - [Edit this role] - [Delete this role] + <% + local r = cfe({type="hidden", value=role}) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info) + htmlviewfunctions.displayitem(cfe({ type="form", value={role=r}, label="", option="Delete", action="deleterole" }), -1, page_info) + %>
<%= html.html_escape(role) %> - [View this role] - [Edit this role] + <% + local r = cfe({type="hidden", value=role}) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info) + %>