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

libs/cbi: Catch errors while creating named sections

Browse source
This commit is contained in:
Steven Barth 2008-09-07 22:00:06 +00:00
parent 24ede00c83
commit 20ebf826d2
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -566,7 +566,7 @@ function AbstractSection.create(self, section)
local stat
if section then
stat = self.map:set(section, nil, self.sectiontype)
stat = section:match("^%w+$") and self.map:set(section, nil, self.sectiontype)
else
section = self.map:add(self.sectiontype)
stat = section
@ -795,6 +795,9 @@ function TypedSection.parse(self, novld)
if name and #name > 0 then
created = self:create(name) and name
if not created then
self.invalid_cts = true
end
end
end
end

4
libs/cbi/luasrc/view/cbi/tblsection.htm
View file

@ -113,8 +113,12 @@ end
<% if self.anonymous then %>
<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
<% else %>
<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
<% if self.invalid_cts then -%>
<br /><%:cbi_invalid%></div>
<%- end %>
<% end %>
</div>
</td>

4
libs/cbi/luasrc/view/cbi/tsection.htm
View file

@ -45,8 +45,12 @@ $Id$
<% if self.anonymous then -%>
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add%>" />
<%- else -%>
<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
<input type="submit" class="cbi-button cbi-button-add" value="<%:cbi_add%>" />
<% if self.invalid_cts then -%>
<br /><%:cbi_invalid%></div>
<%- end %>
<%- end %>
</div>
<%- end %>

2
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
View file

@ -33,6 +33,8 @@ end
function s.create(self, section)
if TypedSection.create(self, section) then
created = section
else
self.invalid_cts = true
end
end