diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-04-30 20:36:02 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-04-30 20:36:02 +0000 |
commit | da880cee19e82ab4770ee3fe5bf362213cc96d10 (patch) | |
tree | b255858307d07356006cccb9c29758b87f90b957 /apk-model.lua | |
parent | 20b0e779f4524e348f123786688a4dc56a2bfe4f (diff) | |
download | acf-apk-tools-da880cee19e82ab4770ee3fe5bf362213cc96d10.tar.bz2 acf-apk-tools-da880cee19e82ab4770ee3fe5bf362213cc96d10.tar.xz |
Modified cfe, removing option, errtxt, and name, and adding label - This may break things.
Rewrote password module, adding model
Modified authenticator to make password module work
git-svn-id: svn://svn.alpinelinux.org/acf/apk/trunk@1052 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'apk-model.lua')
-rw-r--r-- | apk-model.lua | 14 |
1 files changed, 7 insertions, 7 deletions
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 |