summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apk-html.lsp4
-rw-r--r--apk-model.lua14
2 files changed, 9 insertions, 9 deletions
diff --git a/apk-html.lsp b/apk-html.lsp
index 76334ff..19cb085 100644
--- a/apk-html.lsp
+++ b/apk-html.lsp
@@ -25,7 +25,7 @@ io.write("</span>")
<TD style="white-space:nowrap;" class="header">Description</TD>
</TR>
-<? for i,packagetable in pairs(form.value.loaded.option) do ?>
+<? for i,packagetable in pairs(form.value.loaded.value) do ?>
<TR>
<TD style="padding-right:20px;white-space:nowrap;">
<?= html.link{value = "delete?package=" .. packagetable.name, label="Delete"} ?>
@@ -48,7 +48,7 @@ io.write("</span>")
<TD style="white-space:nowrap;" WIDTH="90%" class="header">Package Name</TD>
</TR>
-<? for i,package in pairs(form.value.available.option) do ?>
+<? for i,package in pairs(form.value.available.value) do ?>
<TR>
<TD style="padding-right:20px;white-space:nowrap;">
<?= html.link{value = "install?package=" .. package, label="Install"} ?>
diff --git a/apk-model.lua b/apk-model.lua
index fd329df..4a7962b 100644
--- a/apk-model.lua
+++ b/apk-model.lua
@@ -8,7 +8,7 @@ get_all_packages = function()
local all = {}
for line in f:lines() do all[#all + 1] = line end
f:close()
- return cfe({ type="select", option=all, name="All Packages"})
+ return cfe({ type="list", value=all, label="All Packages"})
end
get_loaded_packages = function()
@@ -22,22 +22,22 @@ get_loaded_packages = function()
temp.version, temp.description = string.match(line, "([^ ]+) %- (.+)")
loaded[#loaded+1] = temp
end
- return cfe({ type="select", option=loaded, name="Loaded Packages"})
+ return cfe({ type="list", value=loaded, label="Loaded Packages"})
end
get_available_packages = function(_loaded_cfe, _all_cfe)
-- available are all except loaded
local loaded_cfe = _loaded_cfe or get_loaded_packages()
local all_cfe = _all_cfe or get_all_packages()
- local loaded = loaded_cfe.option
- local all = all_cfe.option
+ local loaded = loaded_cfe.value
+ local all = all_cfe.value
local available = {}
local reverseloaded = {}
for i,packagetable in ipairs(loaded) do reverseloaded[packagetable.name] = i end
for i,package in ipairs(all) do
if (reverseloaded[package]==nil) then available[#available + 1] = package end
end
- return cfe({ type="select", option=available, name="Available Packages" })
+ return cfe({ type="list", value=available, label="Available Packages" })
end
get_packages = function()
@@ -54,7 +54,7 @@ delete_package = function(package, sessiondata)
-- Destroy menu and permissions info in session so recalculated
if sessiondata then sessiondata.menu = nil end
if sessiondata then sessiondata.permissions = nil end
- return cfe({ type="message", value=cmdresult, name="Result of Delete" })
+ return cfe({ value=cmdresult, label="Result of Delete" })
end
install_package = function(package,sessiondata)
@@ -66,5 +66,5 @@ install_package = function(package,sessiondata)
-- Destroy menu and permissions info in session so recalculated
if sessiondata then sessiondata.menu = nil end
if sessiondata then sessiondata.permissions = nil end
- return cfe({ type="message", value=cmdresult, name="Result of Install" })
+ return cfe({ value=cmdresult, label="Result of Install" })
end