Added cancel button to editdefinition and made to go back to same page / search.

2 files changed, 24 insertions, 1 deletions

diff --git a/did-editdefinition-html.lsp b/did-editdefinition-html.lsp
index 9b960b5..a78a618 100644
--- a/did-editdefinition-html.lsp
+++ b/did-editdefinition-html.lsp
@@ -76,6 +76,10 @@ require("json")
 		});
 		$("input[name='rules']").val(file);
 	}
+	function goBack(){
+		history.back();
+		return false;
+	}
 
 	var emptyrule = {"starttime":"","enddate":"","extension":"","startdate":"","dayofweek":"","endtime":""}
 	var rules = <% -- Generate the data structure in Lua and then convert to json
@@ -96,6 +100,7 @@ require("json")
 		addLine(emptyrule);
 		$("#rules table:even").addClass("alt");
 		$("input.submit").click(submitFile);
+		$("#cancel").click(goBack);
 	});
 </script>
 
@@ -141,4 +146,5 @@ end %>
 
 <H2>Save Changes</H2>
 <DL>
+<DT></DT><DD><input class="submit" type="submit" name="Cancel" value="Cancel" id="cancel"></DD>
 <% displayformend(form) %>
diff --git a/did-html.lsp b/did-html.lsp
index c714a28..963c32f 100644
--- a/did-html.lsp
+++ b/did-html.lsp
@@ -34,6 +34,20 @@ end %>
 </DL>
 <% end %>
 
+<% -- let's create a redirection string
+local redirectstring = {}
+for i,name in ipairs({"page", "did", "extension", "description", "identification", "department"}) do
+	if page_info.clientdata[name] and page_info.clientdata[name] ~= "" then
+		redirectstring[#redirectstring+1] = name.."="..page_info.clientdata[name]
+	end
+end
+if #redirectstring > 0 then
+	redirectstring = page_info.orig_action.."?"..table.concat(redirectstring, "&")
+else
+	redirectstring = page_info.orig_action
+end
+%>
+
 <H1><%= html.html_escape(data.label) %></H1>
 <DL>
 <% displaypagination(pagedata, page_info) %>
@@ -51,7 +65,10 @@ end %>
 <% for i,def in ipairs(subdata) do %>
 	<TR>
 		<TD>
-		<%= html.link{value = "editdefinition?did="..def.did.."&redir="..page_info.orig_action, label="Edit "} %>
+		<form action="/cgi-bin/acf/did/did/editdefinition" method="POST">
+		<input class="hidden" type="hidden" name="did" value="<%= html.html_escape(def.did) %>">
+		<input class="hidden" type="hidden" name="redir" value="<%= html.html_escape(redirectstring) %>">
+		<input class="submit" type="submit" name="Edit" value="Edit"></form>
 	<% if viewlibrary.check_permission("publish") then %>
 		<%= html.link{value = "publish?did=" .. def.did, label="Publish "} %>
 	<% end %>