From c8dea72c8ba7d35273417482dc59070a9de9b9ff Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 5 Jun 2008 14:06:22 +0000 Subject: Updated lbu to use new cfe model and components git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1197 ab2d0c66-481e-0410-8bed-d214d4d58bed --- lib/html.lua | 8 +++++++- lib/viewfunctions.lua | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/html.lua b/lib/html.lua index 0a23184..de69046 100644 --- a/lib/html.lua +++ b/lib/html.lua @@ -183,6 +183,7 @@ function form.select ( v ) reverseval[val]=x end end + local selected = false for i, k in ipairs ( v.option ) do local val = k local txt = nil @@ -194,12 +195,17 @@ function form.select ( v ) if type(v.value) == "table" then if reverseval[val] then str = str .. " selected" + selected = true end elseif ( v.value == val ) then str = str .. " selected" + selected = true end str = str .. nv_pair("value", val) .. ">" .. k .. "" - end + end + if not selected then + str = str .. '' + end str = str .. "" return (str) end diff --git a/lib/viewfunctions.lua b/lib/viewfunctions.lua index 3460764..312ba3b 100644 --- a/lib/viewfunctions.lua +++ b/lib/viewfunctions.lua @@ -93,7 +93,7 @@ function displayitem(myitem) end io.write(">" .. myitem.label .. "\n") io.write("
") - io.write(string.gsub(myitem.value, "\n", "
") .. "\n") + io.write(string.gsub(tostring(myitem.value), "\n", "
") .. "\n") if myitem.descr then io.write("

" .. string.gsub(myitem.descr, "\n", "
") .. "

\n") end if myitem.errtxt then io.write("

" .. string.gsub(myitem.errtxt, "\n", "
") .. "

\n") end io.write("
\n") -- cgit v1.2.3