diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2015-07-06 10:00:19 -0400 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2015-07-06 10:01:39 -0400 |
| commit | 2d27a7f333f3cdf421d3558505f9b54dfa734f54 (patch) | |
| tree | 0b5a136b235c1f9e717384aa302c3099c0f549f2 | |
| parent | 116b9b0f4c06074740ae99e91107c42c5ba56242 (diff) | |
| download | acf-provisioning-2d27a7f333f3cdf421d3558505f9b54dfa734f54.tar.bz2 acf-provisioning-2d27a7f333f3cdf421d3558505f9b54dfa734f54.tar.xz | |
Fix searchdevices HTML view when used for getdevicevalues
(cherry picked from commit 7eda47ba7e6f00fa24d3da99bb6b82c116d03fbf)
| -rw-r--r-- | provisioning-searchdevices-html.lsp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/provisioning-searchdevices-html.lsp b/provisioning-searchdevices-html.lsp index 3cecce2..0cdae00 100644 --- a/provisioning-searchdevices-html.lsp +++ b/provisioning-searchdevices-html.lsp @@ -24,6 +24,7 @@ html = require("acf.html") <% htmlviewfunctions.displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %> <% +-- This view is also used for getdevicevalues, and this is where the values are displayed if form.value.values then local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Device"}), page_info) htmlviewfunctions.displayinfo(form) @@ -35,8 +36,9 @@ if form.value.values then htmlviewfunctions.displaysectionend(header_level2) htmlviewfunctions.displaysectionend(header_level) form.value.values = nil +-- And here we display the list of devices in the result elseif form.value.result then - local func = haserl.loadfile(page_info.viewfile:gsub("searchdevices", "listdevices")) + local func = haserl.loadfile(page_info.viewfile:gsub(page_info.action, "listdevices")) func(form.value.result, viewlibrary, page_info, session) end %> |