From 02fcdd9b39f271b29556de7bf9c113d834db0bb3 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 1 Oct 2014 14:19:19 +0000 Subject: Add redir to delete form in viewpasswdfile HTML view because we need the filename to redirect properly --- freeradius3-viewpasswdfile-html.lsp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/freeradius3-viewpasswdfile-html.lsp b/freeradius3-viewpasswdfile-html.lsp index 015fb20..304833e 100644 --- a/freeradius3-viewpasswdfile-html.lsp +++ b/freeradius3-viewpasswdfile-html.lsp @@ -26,10 +26,7 @@ html = require("acf.html") <% htmlviewfunctions.displaycommandresults({"createpasswdentry"}, session, true) %> <% local filename = cfe({ type="hidden", value=view.value.filename.value }) %> -<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %> -<% -- This is a hack to redirect back to viewing the same file -redir.value = redir.value.."?filename="..html.url_encode(view.value.filename.value) -%> +<% local redir = cfe({ type="hidden", value=page_info.orig_action.."?filename="..html.url_encode(view.value.filename.value) }) %> <% local editable = false @@ -62,7 +59,7 @@ end <% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, entry=entry, redir=redir}, label="", option="Edit", action="editpasswdentry"}), page_info, -1) %> <% end %> <% if viewlibrary.check_permission("deletepasswdentry") then %> - <% htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename, entry=entry}, label="", option="Delete", action="deletepasswdentry", class="deletepasswdentry"}), page_info, -1) %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename, entry=entry, redir=redir}, label="", option="Delete", action="deletepasswdentry", class="deletepasswdentry"}), page_info, -1) %> <% end %> <% if 0 < containspasswd and r[containspasswd] ~= "" and viewlibrary.check_permission("editpasswd") then %> <% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, entry=entry, redir=redir}, label="", option="Change Pass", action="editpasswd"}), page_info, -1) %> -- cgit v1.2.3