From ad8cfe02c2cf62567e3fd474ecbb7bcc258e7e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 28 Jan 2023 20:46:41 +0100
Subject: [PATCH] gluon-web-model: fix Warning field not being hidden
"not self.title" doesn't work because of "self.title = title or """
---
.../files/lib/gluon/web/view/model/warning.html | 8 ++++----
.../lib/gluon/config-mode/model/admin/privatewifi.lua | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html b/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html
index af063ec5..8394bb13 100644
--- a/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html
+++ b/package/gluon-web-model/files/lib/gluon/web/view/model/warning.html
@@ -1,14 +1,14 @@
-<%- if self.title or self.content then -%>
+<%- if not self.hide then -%>
<div class="gluon-warning"<%=
attr("id", id) ..
attr("data-index", self.index) ..
attr("data-depends", self:deplist(self.deps))
%>>
<%- if self.content then -%>
- <%=self.content%>
+ <%= self.content %>
<%- else -%>
- <b><%=self.title%></b><br>
- <%=self.description%>
+ <b><%= self.title %></b><br>
+ <%= self.description %>
<%- end -%>
</div>
<%- end -%>
diff --git a/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua b/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
index 9d29b2b6..c69d22c3 100644
--- a/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
+++ b/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
@@ -27,10 +27,11 @@ local enabled = s:option(Flag, "enabled", translate("Enabled"))
enabled.default = uci:get('wireless', primary_iface) and not uci:get_bool('wireless', primary_iface, "disabled")
local warning = s:element('model/warning', {
- content = mesh_on_wan and translate(
+ content = translate(
'Meshing on WAN interface is enabled. ' ..
'This can lead to problems.'
- ) or nil,
+ ),
+ hide = not mesh_on_wan,
}, 'warning')
warning:depends(enabled, true)
--
GitLab