diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | apk-loaded-html.lsp | 2 | ||||
-rw-r--r-- | apk-model.lua | 4 | ||||
-rw-r--r-- | apk.menu | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,6 @@ APP_NAME=apk-tools PACKAGE=acf-$(APP_NAME) -VERSION=0.4.1 +VERSION=0.4.2 APP_DIST=\ apk* \ diff --git a/apk-loaded-html.lsp b/apk-loaded-html.lsp index 68cda56..d468e8a 100644 --- a/apk-loaded-html.lsp +++ b/apk-loaded-html.lsp @@ -51,7 +51,7 @@ <% if session.permissions.apk.install or session.permissions.apk.upgrade then %> <TD style="padding-right:20px;white-space:nowrap;"> <% if session.permissions.apk.install then %> - <%= html.link{value = "install?package=" .. packagetable.name, label="Install "} %> + <%= html.link{value = "install?package=" .. packagetable.name, label="Promote "} %> <% end %> <% if session.permissions.apk.upgrade and packagetable.upgrade then %> <%= html.link{value = "upgrade?package=" .. packagetable.name, label="Upgrade "} %> diff --git a/apk-model.lua b/apk-model.lua index f5629a0..c1f410c 100644 --- a/apk-model.lua +++ b/apk-model.lua @@ -151,7 +151,7 @@ get_loaded_packages = function() end table.sort(top.value, function(a,b) return (a.name < b.name) end) table.sort(depend.value, function(a,b) return (a.name < b.name) end) - return cfe({ type="group", value={toplevel=top, dependent=depend}, label="Loaded Packages" }) + return cfe({ type="group", value={toplevel=top, dependent=depend}, label="Installed Packages" }) end get_available_packages = function() @@ -159,7 +159,7 @@ get_available_packages = function() -- available are all except same version installed local available = cfe({ type="list", value={}, label="Available Packages" }) for name,value in pairs(repo) do - if value.version and value.version ~= value.installed then + if value.version and (not value.installed or value.version > value.installed) then local temp = {} temp.name = name temp.version = value.version @@ -1,6 +1,6 @@ # Prefix and controller are already known at this point # Cat Group Tab Action -System 30Packages Loaded loaded +System 30Packages Installed loaded System 30Packages Available available System 30Packages Cache cache System 30Packages Expert expert |