From 05e87b21529bbec383ab513e2899048aded15120 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 26 Aug 2013 20:14:20 +0000 Subject: Fix redirection when creating new devices --- provisioning-listrequests-html.lsp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'provisioning-listrequests-html.lsp') diff --git a/provisioning-listrequests-html.lsp b/provisioning-listrequests-html.lsp index 6b53195..52bb518 100644 --- a/provisioning-listrequests-html.lsp +++ b/provisioning-listrequests-html.lsp @@ -13,8 +13,16 @@ html = require("acf.html") 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"); -- cgit v1.2.3