summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorrwalli <rwalli@gmx.net>2018-08-25 19:04:36 +0200
committerJo-Philipp Wich <jo@mein.io>2018-09-29 14:32:18 +0200
commit0fe2e72f7817751aa4f73da31efdc70a799f799a (patch)
treee98c104a6e3a4dcfc24d38a8f37011eb2d089ddc
parentc79a2bbab7923c0c2c7c71e6a7930fdb91af13f7 (diff)
luci-app-wireguard: add descriptions
Add description fields to luci-app-wireguard similar to those in luci-proto-wireguard. Ref: https://github.com/openwrt/luci/commit/140f41b4 Suggested-by: "rwalli" <rwalli@gmx.net> [squash commits, reword commit message, remove semicolons, remove trailing white space] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--applications/luci-app-wireguard/luasrc/view/wireguard.htm18
1 files changed, 17 insertions, 1 deletions
diff --git a/applications/luci-app-wireguard/luasrc/view/wireguard.htm b/applications/luci-app-wireguard/luasrc/view/wireguard.htm
index cd08e9ed5..c25ef85ca 100644
--- a/applications/luci-app-wireguard/luasrc/view/wireguard.htm
+++ b/applications/luci-app-wireguard/luasrc/view/wireguard.htm
@@ -179,10 +179,26 @@ for ikey, iface in pairs(data) do
</div>
</div>
<%-
+ local cur = uci.cursor()
for pkey, peer in pairs(iface.peers) do
+ local desc, tmp_desc, pub_key = "", "", ""
+ cur:foreach("network", "wireguard_" .. ikey, function(s)
+ local tmp_desc, pub_key = "", ""
+ for key, value in pairs(s) do
+ if key == "description" then
+ tmp_desc = value
+ end
+ if value == peer.public_key then
+ pub_key = value
+ end
+ if pub_key == peer.public_key and tmp_desc ~= "" then
+ desc = ': ' .. tmp_desc
+ end
+ end
+ end)
-%>
<div class="tr">
- <div class="td" width="33%" style="vertical-align:top"><%:Peer%></div>
+ <div class="td" width="33%" style="vertical-align:top"><%:Peer%><%=desc%></div>
<div class="td">
<div class="table">
<div class="tr">