From b38802fae54ceef5e11a968b8ca0d74d4c1300b0 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Mon, 27 Oct 2014 19:37:12 +0000
Subject: Reworked the code to allow passing in connection parameters

---
 db-listdatabases-html.lsp | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'db-listdatabases-html.lsp')

diff --git a/db-listdatabases-html.lsp b/db-listdatabases-html.lsp
index b4c6694..dcc9dcf 100644
--- a/db-listdatabases-html.lsp
+++ b/db-listdatabases-html.lsp
@@ -2,7 +2,7 @@
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 <% html = require("acf.html") %>
 
-<% if #form.value>0 then %>
+<% if form.value.databases and #form.value.databases.value>0 then %>
 <script type="text/javascript">
 	if (typeof jQuery == 'undefined') {
 		document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
@@ -23,21 +23,39 @@
 <% end %>
 
 <% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
-<% htmlviewfunctions.displayinfo(form) %>
-<% if #form.value>0 then %>
+<% if form.value.connection then
+	-- hide the database, user, and password, since we don't need them to list databases
+	form.value.connection.value.database = nil
+	form.value.connection.value.user = nil
+	form.value.connection.value.password = nil
+end %>
+<% if form.value.connection and next(form.value.connection.value) ~= nil then
+	htmlviewfunctions.displayformstart(form, page_info)
+	htmlviewfunctions.displayitem(form.value.connection, page_info, htmlviewfunctions.incrementheader(header_level), "connection")
+	form.option = "Update"
+	htmlviewfunctions.displayformend(form, htmlviewfunctions.incrementheader(header_level))
+end %>
+<% if form.value.databases and #form.value.databases.value>0 then %>
 <table id="listdatabases" class="tablesorter"><thead>
         <tr>
 		<th>Action</th>
 		<th>Database</th>
 	</tr>
 </thead><tbody>
-<% local database = cfe({ type="hidden" }) %>
-<% for i,dbase in ipairs(form.value) do %>
-	<% database.value = dbase %>
+<% -- We need to pass the connection key values to listtables
+local formvalues = {}
+if form.value.connection then
+	formvalues.connection = form.value.connection
+	for n,v in pairs(form.value.connection.value) do v.type="hidden" end
+end
+form.value.connection.value.database = cfe({ type="hidden" })
+%>
+<% for i,dbase in ipairs(form.value.databases.value) do %>
+	<% formvalues.connection.value.database.value = dbase %>
 	<tr>
 		<td>
 		<% if viewlibrary.check_permission("listtables") then %>
-			<% htmlviewfunctions.displayitem(cfe({type="link", value={database=database}, label="", option="View", action="listtables"}), page_info, -1) %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value=formvalues, label="", option="View", action="listtables"}), page_info, -1) %>
 		<% end %>
 		</td>
 		<td><%= html.html_escape(dbase) %></td>
-- 
cgit v1.2.3