diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-08-26 20:14:20 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-08-26 22:08:23 +0000 |
| commit | 154342dcb74db921bbf44e36f091c01f20ce96af (patch) | |
| tree | 938efd4656ef36227a396a4104297e6236d0eb3b /provisioning-listrequests-html.lsp | |
| parent | 9703112837f037a1b2b234bac20f923a889f1854 (diff) | |
| download | acf-provisioning-154342dcb74db921bbf44e36f091c01f20ce96af.tar.bz2 acf-provisioning-154342dcb74db921bbf44e36f091c01f20ce96af.tar.xz | |
Fix redirection when creating new devices
(cherry picked from commit 05e87b21529bbec383ab513e2899048aded15120)
Conflicts:
provisioning-controller.lua
provisioning-editdevice-html.lsp
provisioning-editdeviceparams-html.lsp
Diffstat (limited to 'provisioning-listrequests-html.lsp')
| -rw-r--r-- | provisioning-listrequests-html.lsp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/provisioning-listrequests-html.lsp b/provisioning-listrequests-html.lsp index 39b24f7..2858661 100644 --- a/provisioning-listrequests-html.lsp +++ b/provisioning-listrequests-html.lsp @@ -12,8 +12,16 @@ require("viewfunctions") window.location.assign("<%= html.html_escape(page_info.script..page_info.prefix..page_info.controller) %>/searchdevices"); <% end + -- Since we're including a submission of createdevicefromrequest, we need to overcome the automatic redirect - if session.createdevicefromrequestresult then + if session.createdevicefromrequestresult and not session.createdevicefromrequestresult.errtxt then + local tmp = session.createdevicefromrequestresult + session.createdevicefromrequestresult = nil + -- Use JavaScript to redirect to the edit page +%> + window.location.assign("<%= html.html_escape(page_info.script..page_info.prefix..page_info.controller) %>/<% if viewlibrary.check_permission("editdevice") then io.write("editdevice") elseif viewlibrary.check_permission("overridedeviceparams") then io.write("overridedeviceparams") else io.write("editdeviceparams") end %>?device_id=<%= tmp.value.device_id.value %>&redir=<%= html.html_escape(page_info.orig_action) %>"); +<% + elseif session.createdevicefromrequestresult then -- Use JavaScript to redirect to the createdevicefromrequest page %> window.location.assign("<%= html.html_escape(page_info.script..page_info.prefix..page_info.controller) %>/createdevicefromrequest"); |