Change prototype of htmlviewfunctions.dislay item to make consistent

Note: this breaks backward compatibility

5 files changed, 15 insertions, 15 deletions

diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 91a2ea2..551f798 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -8,7 +8,7 @@
 local header_level = htmlviewfunctions.displaysectionstart(form, page_info)
 local header_level2 = htmlviewfunctions.incrementheader(header_level)
 local redir = cfe({ type="hidden", value=page_info.orig_action })
-htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level2, page_info)
+htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), page_info, header_level2)
 
 htmlviewfunctions.displaysectionstart(cfe({label="Existing Accounts"}), page_info, header_level2)
 for i,user in ipairs(form.value) do
@@ -30,9 +30,9 @@ for i,user in ipairs(form.value) do
 			<td style='border:none;'><b>Option</b></td>
 			<td style='border:none;'>
 			<% local userid = cfe({type="hidden", value=user.value.userid.value}) %>
-			<% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituser"}), -1, page_info) %>
-			<% htmlviewfunctions.displayitem(cfe({type="form", value={userid=userid}, label="", option="Delete", action="deleteuser" }), -1, page_info) %>
-			<% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid}, label="", option="View Roles", action=page_info.script.."/acf-util/roles/viewuserroles"}), -1, page_info) %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituser"}), page_info, -1) %>
+			<% htmlviewfunctions.displayitem(cfe({type="form", value={userid=userid}, label="", option="Delete", action="deleteuser" }), page_info, -1) %>
+			<% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid}, label="", option="View Roles", action=page_info.script.."/acf-util/roles/viewuserroles"}), page_info, -1) %>
 			</td>
 		</tr>
 	</tbody></table>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index b9b917e..e3730f4 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -26,7 +26,7 @@
 local header_level = htmlviewfunctions.displaysectionstart(view, page_info)
 local header_level2 = htmlviewfunctions.incrementheader(header_level)
 local redir = cfe({ type="hidden", value=page_info.orig_action })
-htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level2, page_info)
+htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), page_info, header_level2)
 
 htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, header_level2)
 %>
@@ -39,9 +39,9 @@ htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info,
 		<td>
 		<%
 		local r = cfe({type="hidden", value=role})
-		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info)
-		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info)
-		htmlviewfunctions.displayitem(cfe({ type="form", value={role=r}, label="", option="Delete", action="deleterole" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), page_info, -1)
+		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), page_info, -1)
+		htmlviewfunctions.displayitem(cfe({ type="form", value={role=r}, label="", option="Delete", action="deleterole" }), page_info, -1)
 		%>
 		</td></tr>
 	<% end %>
@@ -52,8 +52,8 @@ htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info,
 		<td>
 		<%
 		local r = cfe({type="hidden", value=role})
-		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info)
-		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info)
+		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), page_info, -1)
+		htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), page_info, -1)
 		%>
 		</td></tr>
 	<% end %>
diff --git a/app/status-html.lsp b/app/status-html.lsp
index 093d71c..8c764b3 100644
--- a/app/status-html.lsp
+++ b/app/status-html.lsp
@@ -14,7 +14,7 @@ htmlviewfunctions.displayitem(data.value.version)
 if data.value.version and data.value.version.errtxt and viewlibrary.check_permission("apk-tools/apk/install") then
 	local install = cfe({ type="form", value={}, label="Install package", option="Install", action=page_info.script.."/apk-tools/apk/install" })
 	install.value.package = cfe({ type="hidden", value=data.value.version.name })
-	htmlviewfunctions.displayitem(install, 0, page_info)	-- header_level 0 means display inline without header
+	htmlviewfunctions.displayitem(install, page_info, 0)	-- header_level 0 means display inline without header
 end
 
 htmlviewfunctions.displayitem(data.value.autostart)
@@ -22,7 +22,7 @@ if not (data.value.version and data.value.version.errtxt) and data.value.autosta
 	local autostart = cfe({ type="link", value={}, label="Enable autostart", option="Enable", action=page_info.script.."/alpine-baselayout/rc/edit" })
 	autostart.value.servicename = cfe({ type="hidden", value=data.value.autostart.name })
 	autostart.value.redir = cfe({ type="hidden", value=page_info.orig_action })
-	htmlviewfunctions.displayitem(autostart, 0, page_info)	-- header_level 0 means display inline without header
+	htmlviewfunctions.displayitem(autostart, page_info, 0)	-- header_level 0 means display inline without header
 end
 htmlviewfunctions.displaysectionend(header_level)
 %>
diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua
index f29210b..312c654 100644
--- a/lib/htmlviewfunctions.lua
+++ b/lib/htmlviewfunctions.lua
@@ -89,7 +89,7 @@ function mymodule.displayitemend(myitem, page_info, header_level)
 	end
 end
 
-function mymodule.displayitem(myitem, header_level, page_info)
+function mymodule.displayitem(myitem, page_info, header_level)
 	if not myitem then return end
 	page_info = page_info or {}
 	if myitem.type == "form" or myitem.type == "link" then
@@ -115,7 +115,7 @@ function mymodule.displayitem(myitem, header_level, page_info)
 		end
 		for x,name in ipairs(order) do
 			if myitem.value[name] then
-				mymodule.displayitem(myitem.value[name], mymodule.incrementheader(header_level))
+				mymodule.displayitem(myitem.value[name], page_info, mymodule.incrementheader(header_level))
 			end
 		end
 		mymodule.displaysectionend(header_level)
diff --git a/lua/mvc.lua b/lua/mvc.lua
index 31846ab..8735942 100755
--- a/lua/mvc.lua
+++ b/lua/mvc.lua
@@ -341,7 +341,7 @@ end
 mymodule.auto_view = function(viewtable, viewlibrary, pageinfo, session)
 	if pageinfo.viewtype == "html" then
 		local htmlviewfunctions = require("htmlviewfunctions")
-		htmlviewfunctions.displayitem(viewtable, 1, pageinfo)
+		htmlviewfunctions.displayitem(viewtable, pageinfo)
 	elseif pageinfo.viewtype == "json" then
 		local json = require("json")
 		print(json.encode(viewtable))