Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/cbi: Compatibility changes for non-standards-compliant browsers

Browse source
This commit is contained in:
Steven Barth 2008-09-03 22:51:27 +00:00
parent ccd792c4d1
commit 34ab619ee3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/cbi/luasrc/cbi.lua
View file

@ -52,7 +52,7 @@ function load(cbimap, ...)
require("luci.util")
local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err = loadfile(cbidir..cbimap..".lua")
local func, err = loadfile(cbimap) or loadfile(cbidir..cbimap..".lua")
assert(func, err)
luci.i18n.loadc("cbi")
@ -711,6 +711,9 @@ function TypedSection.parse(self)
local crval = REMOVE_PREFIX .. self.config
local name = luci.http.formvaluetable(crval)
for k,v in pairs(name) do
if k:sub(-2) == ".x" then
k = k:sub(1, #k - 2)
end
if self:cfgvalue(k) and self:checkscope(k) then
self:remove(k)
end
@ -1211,8 +1214,9 @@ function DynamicList.validate(self, value, section)
local valid = {}
for i, v in ipairs(value) do
if v and #v > 0 and
not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i) then
if v and #v > 0
and not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i)
and not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i..".x") then
table.insert(valid, v)
end
end