From e3f8780934093cbf4618bfa39f69f25920dfb28e Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Wed, 22 Oct 2008 18:50:22 +0000
Subject: Modified viewfunctions to split displayform, creating
 displayformstart and displayformend, to provide flexibility while still using
 the library. Also added support for hidden fields - including a common redir
 field. Removed redirectOnSuccess from controllerfunctions handle_form, and
 replaced it with the redir field. Removed redirectOnSuccess from controllers
 that used it and added handlecommandresults and redir entries to links and
 forms throughout many views. This will cause a redirect to the originating
 view when a form is successfully completed. acf_www-controller now includes
 orig_action in page_info to report the original action launched by the user.

git-svn-id: svn://svn.alpinelinux.org/acf/tinydns/trunk@1560 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 tinydns-listpermissions-html.lsp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tinydns-listpermissions-html.lsp')

diff --git a/tinydns-listpermissions-html.lsp b/tinydns-listpermissions-html.lsp
index 355e49e..fc80db9 100644
--- a/tinydns-listpermissions-html.lsp
+++ b/tinydns-listpermissions-html.lsp
@@ -1,15 +1,18 @@
-<% local view, viewlibrary, page_info = ... %> 
+<% local view, viewlibrary, page_info, session = ... %>
+<% require("viewfunctions") %>
 <% --[[
 	io.write(html.cfe_unpack(view))
 --]] %>
 
+<% displaycommandresults({"edituserpermisisons", "editrolepermissions"}, session) %>
+
 <H1><%= view.label %></H1>
 
 <H2>User Permissions</H2>
 <TABLE>
 <TR><TD CLASS='header'>User</TD><TD CLASS='header'>Permissions</TD>
 <% for i,user in ipairs(view.value.user) do %>
-	<TR><TD><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/edituserpermissions?userid=" .. user.id, label=user.id} %></TD><TD>
+	<TR><TD><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/edituserpermissions?userid=" .. user.id .. "&redir="..page_info.orig_action, label=user.id} %></TD><TD>
 	<% for y,allowed in pairs(user.allowed) do
 		print(allowed, "<BR>")
 	end %>
@@ -21,7 +24,7 @@
 <TABLE>
 <TR><TD CLASS='header'>Role</TD><TD CLASS='header'>Permissions</TD>
 <% for i,role in ipairs(view.value.role) do %>
-	<TR><TD><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/editrolepermissions?role=" .. role.id, label=role.id} %></TD><TD>
+	<TR><TD><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/editrolepermissions?role=" .. role.id .. "&redir="..page_info.orig_action, label=role.id} %></TD><TD>
 	<% for y,allowed in pairs(role.allowed) do
 		print(allowed, "<BR>")
 	end %>
-- 
cgit v1.2.3