nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-web-autoupdater: use human-readable names as branch labels, sort by label

Browse Source 
Use the value of the `name` site.conf field as label (it was
accidentally unused before).

Our site.conf currently doesn't define a specific order for the branch
entries. To avoid changing branch orders, sort entries by this label.

Fixes: #1961
This commit is contained in:
Matthias Schiffer 2020-04-18 18:54:08 +02:00 committed by Martin Weinelt
parent 42650393b6
commit 696b4316da
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/gluon-web-autoupdater/luasrc/lib/gluon/config-mode/model/admin/autoupdater.lua
View File

@ -22,11 +22,18 @@ function o:write(data)
end end
o = s:option(ListValue, "branch", translate("Branch")) o = s:option(ListValue, "branch", translate("Branch"))
uci:foreach("autoupdater", "branch",
function (section) local branches = {}
o:value(section[".name"]) uci:foreach("autoupdater", "branch", function(branch)
table.insert(branches, branch)
end)
table.sort(branches, function(a, b)
return a.name < b.name
end)
for _, branch in ipairs(branches) do
o:value(branch[".name"], branch.name)
end end
)
o.default = uci:get("autoupdater", autoupdater, "branch") o.default = uci:get("autoupdater", autoupdater, "branch")
function o:write(data) function o:write(data)
uci:set("autoupdater", autoupdater, "branch", data) uci:set("autoupdater", autoupdater, "branch", data)