From 05e87b21529bbec383ab513e2899048aded15120 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Mon, 26 Aug 2013 20:14:20 +0000
Subject: Fix redirection when creating new devices

---
 provisioning-editdevice-html.lsp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'provisioning-editdevice-html.lsp')

diff --git a/provisioning-editdevice-html.lsp b/provisioning-editdevice-html.lsp
index a922ec4..827ea9b 100644
--- a/provisioning-editdevice-html.lsp
+++ b/provisioning-editdevice-html.lsp
@@ -1,10 +1,28 @@
-<% local form, viewlibrary, page_info = ... 
+<% local form, viewlibrary, page_info, session = ... 
 require("htmlviewfunctions")
 html = require("acf.html")
 %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
 <script type="text/javascript">
+
+<% -- Since we want to redirect to edit a new device's parameters, we create an automatic redirect
+	if page_info.action == "createdevice" and form.descr and not form.errtxt then
+		-- 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("overridedeviceparams") then io.write("overridedeviceparams") elseif viewlibrary.check_permission("editdeviceparams") then io.write("editdeviceparams") else io.write("editdevice") end %>?device_id=<%= form.value.device_id.value %>&redir=<%= html.html_escape(page_info.orig_action) %>");
+<%
+	end
+%>
+<% -- Since we're including deletedevice as a component, we break the automatic redirect
+	if session.deletedeviceresult and not session.deletedeviceresult.errtxt and viewlibrary.check_permission("listdevices") then
+		-- Use JavaScript to redirect to the listdevices page
+%>
+		window.location.assign("<%= html.html_escape(page_info.script..page_info.prefix..page_info.controller) %>/listdevices");
+<%
+	end
+%>
+
         $(document).ready(function() {
 		$(".deletedevice").click(function(){ return confirm("Are you sure you want to delete this device?")});
         });
-- 
cgit v1.2.3