diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-10-01 12:35:22 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-10-01 12:35:22 +0000 |
| commit | 9d6cae1e656fb77f35c5488c35bf21a2876141de (patch) | |
| tree | 8c56aaadca69af593aad7d27e83d7805792d1f28 | |
| parent | d5363dd01400989078c25d355390ce1d34f5a8b1 (diff) | |
| download | acf-freeradius3-9d6cae1e656fb77f35c5488c35bf21a2876141de.tar.bz2 acf-freeradius3-9d6cae1e656fb77f35c5488c35bf21a2876141de.tar.xz | |
Fix links from editmacauthfile and viewpasswdfile HTML views to editfile - typos and add displaycommandresults
| -rw-r--r-- | freeradius3-editmacauthfile-html.lsp | 8 | ||||
| -rw-r--r-- | freeradius3-viewpasswdfile-html.lsp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/freeradius3-editmacauthfile-html.lsp b/freeradius3-editmacauthfile-html.lsp index c9015c0..cccfe06 100644 --- a/freeradius3-editmacauthfile-html.lsp +++ b/freeradius3-editmacauthfile-html.lsp @@ -1,4 +1,4 @@ -<% local form, viewlibrary, page_info = ... %> +<% local form, viewlibrary, page_info, session = ... %> <% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> @@ -71,6 +71,8 @@ }); </script> +<% htmlviewfunctions.displaycommandresults({"editfile"}, session) %> + <% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Edit MAC Authentication File"}), page_info) htmlviewfunctions.displayitem(form.value.filename) @@ -97,8 +99,8 @@ end htmlviewfunctions.displaysectionend(header_level) %> -<% if not form.value.filename.errtxt and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("editfile" then +<% if not form.value.filename.errtxt and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("editfile") then local filename = cfe({ type="hidden", value=form.value.filename.value }) local redir = cfe({ type="hidden", value=page_info.orig_action.."?filename="..html.url_encode(form.value.filename.value) }) - htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="Expert", option="Edit", action="editfile"}), page_info, htmlviewfunctions.incrementheader(header_level)) %> + htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="Expert", option="Edit", action="editfile"}), page_info, htmlviewfunctions.incrementheader(header_level)) end %> diff --git a/freeradius3-viewpasswdfile-html.lsp b/freeradius3-viewpasswdfile-html.lsp index c18e13c..015fb20 100644 --- a/freeradius3-viewpasswdfile-html.lsp +++ b/freeradius3-viewpasswdfile-html.lsp @@ -22,7 +22,7 @@ html = require("acf.html") }); </script> -<% htmlviewfunctions.displaycommandresults({"editpasswdentry", "deletepasswdentry", "editpasswd"}, session) %> +<% htmlviewfunctions.displaycommandresults({"editpasswdentry", "deletepasswdentry", "editpasswd", "editfile"}, session) %> <% htmlviewfunctions.displaycommandresults({"createpasswdentry"}, session, true) %> <% local filename = cfe({ type="hidden", value=view.value.filename.value }) %> @@ -78,8 +78,8 @@ end <% end %> -<% if editable and view.value.data and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("editfile" then - htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="Expert", option="Edit", action="editfile"}), page_info, htmlviewfunctions.incrementheader(header_level)) %> +<% if editable and view.value.data and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("editfile") then + htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, redir=redir}, label="Expert", option="Edit", action="editfile"}), page_info, htmlviewfunctions.incrementheader(header_level)) end %> <% if editable and view.value.data and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createpasswdentry") then |