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/core/trunk@1560 ab2d0c66-481e-0410-8bed-d214d4d58bed

4 files changed, 12 insertions, 10 deletions

diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua
index bea4480..b2fab85 100755
--- a/app/acf-util/password-controller.lua
+++ b/app/acf-util/password-controller.lua
@@ -60,7 +60,7 @@ function newuser(self)
 			return self.model.read_user(self)
 		end, function(value)
 			return self.model.create_user(self, value)
-		end, self.clientdata, "Save", "New User Settings", "Saved user", "status")
+		end, self.clientdata, "Save", "New User Settings", "Saved user")
 end
 
 function deleteuser(self)
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 26416ce..d7db4e9 100755
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,4 +1,4 @@
-<% local form, viewlibrary, pageinfo, session = ... %>
+<% local form, viewlibrary, page_info, session = ... %>
 <% require("viewfunctions") %>
 <%
 --[[ DEBUG INFORMATION
@@ -8,11 +8,12 @@ io.write("</span>")
 --]]
 %>
 
-<% displaycommandresults({"deleteuser"}, session) %>
+<% displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
 
 <H1>User Accounts</H1>
 <H2>Create new account</H2>
-<form action="newuser" method="POST">
+<form action="<%= page_info.script .. page_info.prefix .. page_info.controller %>/newuser" method="POST">
+<input class="hidden" type="hidden"  name="redir"  value="<%= page_info.orig_action %>" >
 <dl><dt></dt><dd><input class="submit" type="submit" value="New User"></dd></dl>
 </form>
 <H2>Existing account</H2>
@@ -32,9 +33,9 @@ io.write("</span>")
 		</TR><TR>
 			<TD STYLE='border:none;'><B>Option</B></TD>
 			<TD STYLE='border:none;'>
-			[<A HREF='edituser?userid=<%= name %>'>Edit this account</A>]
+			[<A HREF='edituser?userid=<%= name %>&redir=<%= page_info.orig_action %>'>Edit this account</A>]
 			[<A HREF='deleteuser?userid=<%= name %>'>Delete this account</A>]
-			[<A HREF='<%= pageinfo.script %>/acf-util/roles/viewuserroles?userid=<%= name %>'>View roles for this account</A>]
+			[<A HREF='<%= page_info.script %>/acf-util/roles/viewuserroles?userid=<%= name %>'>View roles for this account</A>]
 			</TD>
 		</TR>
 	</TABLE></DD>
diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua
index 91d4d9c..738f54f 100644
--- a/app/acf-util/roles-controller.lua
+++ b/app/acf-util/roles-controller.lua
@@ -47,14 +47,14 @@ newrole = function(self)
 	return controllerfunctions.handle_form(self, 
 		function() return self.model.getpermissions(self) end, 
 		function(value) return self.model.setpermissions(self, value, true) end, 
-		self.clientdata, "Save", "Create New Role", "New Role Created", "viewroles")
+		self.clientdata, "Save", "Create New Role", "New Role Created")
 end
 
 editrole = function(self)
 	return controllerfunctions.handle_form(self, 
 		function() return self.model.getpermissions(self, self.clientdata.role) end, 
 		function(value) return self.model.setpermissions(self, value, false) end, 
-		self.clientdata, "Save", "Edit Role", "Role Saved", "viewroles")
+		self.clientdata, "Save", "Edit Role", "Role Saved")
 end
 
 deleterole = function(self)
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index f5ca4d5..8b9a10f 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -5,11 +5,12 @@
 	io.write(html.cfe_unpack(view))
 --]] %>
 
-<% displaycommandresults({"deleterole"}, session) %>
+<% displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
 
 <H1>Roles</H1>
 <H2>Create new role</H2>
 <form action="<%= page_info.script .. page_info.prefix .. page_info.controller %>/newrole" method="POST">
+<input class="hidden" type="hidden"  name="redir"  value="<%= page_info.orig_action %>" >
 <dl><dt></dt><dd><input class="submit" type="submit" value="New Role"></dd></dl>
 </form>
 
@@ -31,7 +32,7 @@
 		<dt><img src='/static/tango/16x16/apps/system-users.png' height='16' width='16'> <%= role %></dt>
 		<dd>
 		[<a href='viewroleperms?role=<%= role %>'>View this role</a>]
-		[<a href='editrole?role=<%= role %>'>Edit this role</a>]
+		[<a href='editrole?role=<%= role %>&redir=<%= page_info.orig_action %>'>Edit this role</a>]
 		[<a href='deleterole?role=<%= role %>'>Delete this role</a>]
 		</dd>
 	<% end %>