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

libs/web: skip empty values in DynList widget

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-11-20 18:08:18 +00:00
parent aa0f710867
commit ff58e81d18
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/web/luasrc/cbi.lua
View file

@ -1662,7 +1662,9 @@ function DynamicList.write(self, section, value)
elseif self.cast == "table" and type(value) == "string" then elseif self.cast == "table" and type(value) == "string" then
local x, t = { } local x, t = { }
for x in value:gmatch("%S+") do for x in value:gmatch("%S+") do
t[#t+1] = x if #x > 0 then
t[#t+1] = x
end
end end
value = t value = t
end end
@ -1677,7 +1679,9 @@ function DynamicList.cfgvalue(self, section)
local x local x
local t = { } local t = { }
for x in value:gmatch("%S+") do for x in value:gmatch("%S+") do
t[#t+1] = x if #x > 0 then
t[#t+1] = x
end
end end
value = t value = t
end end

3
libs/web/luasrc/view/cbi/dynlist.htm
View file

@ -18,12 +18,13 @@ $Id$
local vals = self:cfgvalue(section) or {} local vals = self:cfgvalue(section) or {}
for i=1, #vals + 1 do for i=1, #vals + 1 do
local val = vals[i] local val = vals[i]
if val and #val > 0 then
%> %>
<input class="cbi-input-text" value="<%=pcdata(val)%>" onchange="cbi_d_update(this.id)" type="text"<%= <input class="cbi-input-text" value="<%=pcdata(val)%>" onchange="cbi_d_update(this.id)" type="text"<%=
attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size") .. attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size") ..
ifattr(i == 1 and self.placeholder, "placeholder", self.placeholder) ifattr(i == 1 and self.placeholder, "placeholder", self.placeholder)
%> /><br /> %> /><br />
<% end %> <% end end %>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
cbi_dynlist_init('<%=cbid%>'); cbi_dynlist_init('<%=cbid%>');