projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02ad68a
)
libs/web: fix dynamic list handling
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 3 Dec 2010 12:41:12 +0000
(12:41 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 3 Dec 2010 12:41:12 +0000
(12:41 +0000)
libs/web/luasrc/cbi.lua
patch
|
blob
|
history
diff --git
a/libs/web/luasrc/cbi.lua
b/libs/web/luasrc/cbi.lua
index
ce99580
..
6934be6
100644
(file)
--- a/
libs/web/luasrc/cbi.lua
+++ b/
libs/web/luasrc/cbi.lua
@@
-1346,7
+1346,7
@@
function AbstractValue.cfgvalue(self, section)
return value[1]
end
elseif self.cast == "table" then
return value[1]
end
elseif self.cast == "table" then
- return
luci.util.split(value, "%s+", nil, true)
+ return
{ value }
end
end
end
end
@@
-1660,11
+1660,6
@@
function DynamicList.write(self, section, value)
t[#t+1] = x
end
end
t[#t+1] = x
end
end
- elseif self.cast == "table" then
- local x
- for x in util.imatch(value) do
- t[#t+1] = x
- end
else
t = { value }
end
else
t = { value }
end
@@
-1699,12
+1694,16
@@
function DynamicList.formvalue(self, section)
local value = AbstractValue.formvalue(self, section)
if type(value) == "string" then
local value = AbstractValue.formvalue(self, section)
if type(value) == "string" then
- local x
- local t = { }
- for x in value:gmatch("%S+") do
- t[#t+1] = x
+ if self.cast == "string" then
+ local x
+ local t = { }
+ for x in value:gmatch("%S+") do
+ t[#t+1] = x
+ end
+ value = t
+ else
+ value = { value }
end
end
- value = t
end
return value
end
return value