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>

diff --git a/applications/luci-app-wireguard/luasrc/view/wireguard.htm b/applications/luci-app-wireguard/luasrc/view/wireguard.htm
index cd08e9ed51864b68496be60b21095a1e8d0d31d2..c25ef85caacc4f1c5dcc23de9f30139c1ac778d5 100644 (file)
--- 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">