diff options
| -rw-r--r-- | libs/cbi/luasrc/cbi.lua | 54 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/nullsection.htm | 20 | ||||
| -rw-r--r-- | libs/cbi/luasrc/view/cbi/simpleform.htm | 7 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua | 3 |
4 files changed, 70 insertions, 14 deletions
diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index 9996c8418..ecc910a13 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -247,6 +247,15 @@ end --[[ +Page - A simple node +]]-- + +Page = class(Node) +Page.__init__ = Node.__init__ +Page.parse = function() end + + +--[[ SimpleForm - A Simple non-UCI form ]]-- SimpleForm = class(Node) @@ -265,10 +274,12 @@ function SimpleForm.parse(self, ...) end local valid = true - for i, v in ipairs(self.children) do - valid = valid - and (not v.tag_missing or not v.tag_missing[1]) - and (not v.tag_invalid or not v.tag_invalid[1]) + for k, j in ipairs(self.children) do + for i, v in ipairs(j.children) do + valid = valid + and (not v.tag_missing or not v.tag_missing[1]) + and (not v.tag_invalid or not v.tag_invalid[1]) + end end local state = @@ -276,7 +287,7 @@ function SimpleForm.parse(self, ...) or valid and 1 or -1 - self.dorender = self:handle(state, self.data) + self.dorender = self:handle(state, self.data) ~= false end function SimpleForm.render(self, ...) @@ -285,12 +296,33 @@ function SimpleForm.render(self, ...) end end --- Creates a child section +function SimpleForm.section(self, class, ...) + if instanceof(class, AbstractSection) then + local obj = class(self, ...) + self:append(obj) + return obj + else + error("class must be a descendent of AbstractSection") + end +end + +-- Creates a child field function SimpleForm.field(self, class, ...) + local section + for k, v in ipairs(self.children) do + if instanceof(v, SimpleSection) then + section = v + break + end + end + if not section then + section = self:section(SimpleSection) + end + if instanceof(class, AbstractValue) then local obj = class(self, ...) obj.track_missing = true - self:append(obj) + section:append(obj) return obj else error("class must be a descendent of AbstractValue") @@ -439,6 +471,14 @@ function AbstractSection.create(self, section) end +SimpleSection = class(AbstractSection) + +function SimpleSection.__init__(self, form, ...) + AbstractSection.__init__(self, form, nil, ...) + self.template = "cbi/nullsection" +end + + --[[ NamedSection - A fixed configuration section defined by its name diff --git a/libs/cbi/luasrc/view/cbi/nullsection.htm b/libs/cbi/luasrc/view/cbi/nullsection.htm new file mode 100644 index 000000000..b01a6a9f5 --- /dev/null +++ b/libs/cbi/luasrc/view/cbi/nullsection.htm @@ -0,0 +1,20 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth <steven@midlink.org> +Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +-%> + <fieldset class="cbi-section"> + <div class="cbi-section-node"> + <% self:render_children(1, scope or {}) %> + </div> + <br /> + </fieldset>
\ No newline at end of file diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm index d2ae401c9..0b2270197 100644 --- a/libs/cbi/luasrc/view/cbi/simpleform.htm +++ b/libs/cbi/luasrc/view/cbi/simpleform.htm @@ -21,12 +21,7 @@ $Id$ <div class="cbi-map" id="cbi-<%=self.config%>"> <h1><%=self.title%></h1> <div class="cbi-map-descr"><%=self.description%></div> - <fieldset class="cbi-section"> - <div class="cbi-section-node"> - <% self:render_children(1, scope or {}) %> - </div> - <br /> - </fieldset> + <% self:render_children() %> <br /> </div> <%- if self.message then %> diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua index a204d420f..1c5569ccd 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua @@ -17,6 +17,7 @@ local keyfile = "/etc/dropbear/authorized_keys" f = SimpleForm("sshkeys", translate("a_s_sshkeys"), translate("a_s_sshkeys1")) t = f:field(TextValue, "keys") +t.rmempty = true t.rows = 10 function t.cfgvalue() return luci.fs.readfile(keyfile) or "" @@ -24,7 +25,7 @@ end function f.handle(self, state, data) if state == FORM_VALID then - if (luci.fs.readfile(keyfile) or "") ~= data.keys then + if data.keys then luci.fs.writefile(keyfile, data.keys) end end |