summaryrefslogtreecommitdiffhomepage
path: root/libs/web/luasrc/cbi.lua
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-12-20 17:52:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-12-20 17:52:10 +0000
commit3553d308f65a037d7cef2f0c7546db44c23afa14 (patch)
tree9025f22fdc470dd93bd77b5342ef21650b20b8e8 /libs/web/luasrc/cbi.lua
parent8358175f25c1d73002af5a3ae8f9a7d4711bf228 (diff)
[PATCH] Naive fix for bug #208
For SimpleSection, use the section name (always "1") instead of the section type in the CBI-like string used to identify the upload. This allows upload fields to be placed in SimpleSections. The fix changes a minimal number of lines, but does introduce some unnecessary confusion, it may or may not be better than a more thorough/invasive fix. Set the enctype for the form element in the simpleform view to be multipart/form-data because the default application/x-www-form-urlencoded does not support input files. Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
Diffstat (limited to 'libs/web/luasrc/cbi.lua')
-rw-r--r--libs/web/luasrc/cbi.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/web/luasrc/cbi.lua b/libs/web/luasrc/cbi.lua
index 8b9805f04..ff030a268 100644
--- a/libs/web/luasrc/cbi.lua
+++ b/libs/web/luasrc/cbi.lua
@@ -102,7 +102,7 @@ function load(cbimap, ...)
for _, field in ipairs(map.upload_fields) do
uploads[
field.config .. '.' ..
- field.section.sectiontype .. '.' ..
+ (field.section.sectiontype or '1') .. '.' ..
field.option
] = true
end
@@ -124,8 +124,8 @@ function load(cbimap, ...)
)()
if c and s and o then
- local t = uci:get( c, s )
- if t and uploads[c.."."..t.."."..o] then
+ local t = uci:get( c, s ) or s
+ if uploads[c.."."..t.."."..o] then
local path = upldir .. field.name
fd = io.open(path, "w")
if fd then