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

Merge pull request #2772 from ffgraz/warn2

Browse Source 
gluon-web-model: fix issue with warning blocking save on private-wifi
This commit is contained in:
David Bauer 2023-02-03 03:07:33 +01:00 committed by GitHub
commit 1780bafafc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-web-model/files/lib/gluon/web/view/model/warning.html
View File

@ -1,4 +1,4 @@
<%- if self.title or self.content then -%> <%- if not self.hide then -%>
<div class="gluon-warning"<%= <div class="gluon-warning"<%=
attr("id", id) .. attr("id", id) ..
attr("data-index", self.index) .. attr("data-index", self.index) ..

17
package/gluon-web-model/luasrc/usr/lib/lua/gluon/web/model/classes.lua
View File

@ -429,6 +429,23 @@ function Element:__init__(template, kv, ...)
self.error = false self.error = false
end end
function Element:parse(http)
if not self.datatype then
self.state = M.FORM_VALID
return
end
return AbstractValue:parse(http)
end
function Element:validate()
if not self.datatype then
return true
end
AbstractValue:validate()
end
local Section = class(Node) local Section = class(Node)
M.Section = Section M.Section = Section

5
package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
View File

@ -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") enabled.default = uci:get('wireless', primary_iface) and not uci:get_bool('wireless', primary_iface, "disabled")
local warning = s:element('model/warning', { local warning = s:element('model/warning', {
content = mesh_on_wan and translate( content = translate(
'Meshing on WAN interface is enabled. ' .. 'Meshing on WAN interface is enabled. ' ..
'This can lead to problems.' 'This can lead to problems.'
) or nil, ),
hide = not mesh_on_wan,
}, 'warning') }, 'warning')
warning:depends(enabled, true) warning:depends(enabled, true)