From: Steven Barth <steven@midlink.org>
Date: Sat, 30 Aug 2008 15:41:02 +0000 (+0000)
Subject: libs/cbi: Simplified _uvl_validate_section
X-Git-Tag: 0.8.0~235
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=171cbec25d279c3913e781c49f3061edc51c15c1;p=oweals%2Fluci.git

libs/cbi: Simplified _uvl_validate_section
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 6ffeca6b0..fe207739f 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -94,16 +94,13 @@ local function _uvl_validate_section(node, name)
 		end
 		for i, v in ipairs(err.childs) do
 			if v.option and node.fields[v.option] then
-				if v:is(luci.uvl.errors.ERR_OPTION) then
-					local suberr = v.childs and v.childs[1]
-					if suberr:is(luci.uvl.errors.ERR_DEPENDENCY) then
-						node.fields[v.option].tag_reqerror[name] = true
-					elseif suberr:is(luci.uvl.errors.ERR_OPT_REQUIRED) then
-						node.fields[v.option].tag_missing[name] = true
-						node.tag_deperror[name] = true
-					else
-						node.fields[v.option].tag_invalid[name] = true
-					end
+				if v:is(luci.uvl.errors.ERR_DEPENDENCY) then
+					node.fields[v.option].tag_reqerror[name] = true
+				elseif v:is(luci.uvl.errors.ERR_OPT_REQUIRED) then
+					node.fields[v.option].tag_missing[name] = true
+					node.tag_deperror[name] = true
+				elseif v:is(luci.uvl.errors.ERR_OPTION) then
+					node.fields[v.option].tag_invalid[name] = true
 				end
 			end
 		end