Skip to content
Snippets Groups Projects
Unverified Commit e8c65ef7 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-web-model: fix conflicting table fields "reset"

With 11a3b566 ("gluon-web-model: add dependency support for
sections"), a "reset" function was added to all model nodes. This
conflicts with the "reset" field of the Form object, making reset
buttons show labels like "function: 0xbb8d50" and possibly breaking form
processing when packages override the reset field.
parent 45b518df
No related branches found
No related tags found
No related merge requests found
...@@ -72,9 +72,9 @@ function Node:id() ...@@ -72,9 +72,9 @@ function Node:id()
return prefix.."."..self:id_suffix() return prefix.."."..self:id_suffix()
end end
function Node:reset() function Node:reset_node()
for _, child in ipairs(self.children) do for _, child in ipairs(self.children) do
child:reset() child:reset_node()
end end
end end
...@@ -154,7 +154,7 @@ function Node:resolve_node_depends() ...@@ -154,7 +154,7 @@ function Node:resolve_node_depends()
if valid then return false end if valid then return false end
end end
self:reset() self:reset_node()
return true return true
end end
...@@ -206,7 +206,7 @@ function AbstractValue:cfgvalue() ...@@ -206,7 +206,7 @@ function AbstractValue:cfgvalue()
end end
end end
function AbstractValue:reset() function AbstractValue:reset_node()
self.data = nil self.data = nil
self.error = false self.error = false
self.state = M.FORM_NODATA self.state = M.FORM_NODATA
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment