openwrt/luci
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/luci.git synced 2025-05-01 05:11:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-dockerman: fix network page issue (#270)

Browse Source 
* luci-app-dockerman: fix network page issue

* Update containers.lua
This commit is contained in:
HHJLKK 2024-03-10 01:13:15 +08:00 committed by GitHub
parent ee89490e97
commit aed573a82a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua
View File

@ -83,10 +83,9 @@ function get_containers()
end
end
end
for ii,iv in ipairs(images) do
if iv.Id == v.ImageID then
data[index]["_image"] = iv.RepoTags and iv.RepoTags[1] or (iv.RepoDigests[1]:gsub("(.-)@.+", "%1") .. ":<none>")
data[index]["_image"] = iv.RepoTags and iv.RepoTags[1] or (next(iv.RepoDigests) and (iv.RepoDigests[1]:gsub("(.-)@.+", "%1") .. ":<none>")) or ""
end
end
data[index]["_id_name"] = '<a href='..luci.dispatcher.build_url("admin/docker/container/"..v.Id)..' class="dockerman_link" title="'..translate("Container detail")..'">'.. data[index]["_name"] .. "<br><font color='#9f9f9f'>ID: " .. data[index]["_id"]

4
applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua
View File

@ -41,8 +41,8 @@ local get_networks = function ()
data[index]["_interface"] = v.Options.parent
end
data[index]["_subnet"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
data[index]["_gateway"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
data[index]["_subnet"] = v.IPAM and v.IPAM.Config and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
data[index]["_gateway"] = v.IPAM and v.IPAM.Config and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
end
return data