projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge CBI change-detection
[project/luci.git]
/
libs
/
cbi
/
luasrc
/
cbi.lua
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
296ec81
..
78f6b7d
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-32,13
+32,16
@@
require("luci.http")
require("luci.uvl")
require("luci.fs")
require("luci.uvl")
require("luci.fs")
+--local event = require "luci.sys.event"
local uci = require("luci.model.uci")
local class = luci.util.class
local instanceof = luci.util.instanceof
FORM_NODATA = 0
local uci = require("luci.model.uci")
local class = luci.util.class
local instanceof = luci.util.instanceof
FORM_NODATA = 0
+FORM_PROCEED = 0
FORM_VALID = 1
FORM_INVALID = -1
FORM_VALID = 1
FORM_INVALID = -1
+FORM_CHANGED = 2
AUTO = true
AUTO = true
@@
-121,7
+124,6
@@
function load(cbimap, ...)
end
if field.name == cbid and fd then
end
if field.name == cbid and fd then
- io.stderr:write("*** CHUNK:"..tostring(#chunk).." ***\n")
fd:write(chunk)
end
fd:write(chunk)
end
@@
-287,6
+289,9
@@
function Map.__init__(self, config, ...)
self.apply_on_parse = nil
self.uci = uci.cursor()
self.save = true
self.apply_on_parse = nil
self.uci = uci.cursor()
self.save = true
+
+ self.changed = false
+
if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
@@
-305,6
+310,9
@@
function Map.get_scheme(self, sectiontype, option)
end
end
end
end
+function Map.submitstate(self)
+ return luci.http.formvalue("cbi.submit")
+end
-- Chain foreign config
function Map.chain(self, config)
-- Chain foreign config
function Map.chain(self, config)
@@
-319,7
+327,7
@@
function Map.parse(self)
for i, config in ipairs(self.parsechain) do
self.uci:save(config)
end
for i, config in ipairs(self.parsechain) do
self.uci:save(config)
end
- if
luci.http.formvalue("cbi.apply"
) then
+ if
self:submitstate() and (self.autoapply or luci.http.formvalue("cbi.apply")
) then
for i, config in ipairs(self.parsechain) do
self.uci:commit(config)
for i, config in ipairs(self.parsechain) do
self.uci:commit(config)
@@
-343,9
+351,21
@@
function Map.parse(self)
self.uci:unload(config)
end
if type(self.commit_handler) == "function" then
self.uci:unload(config)
end
if type(self.commit_handler) == "function" then
- self:commit_handler()
+ self:commit_handler(
self:submitstate()
)
end
end
end
end
+
+ if self:submitstate() then
+ if self.save then
+ self.state = self.changed and FORM_CHANGED or FORM_VALID
+ else
+ self.state = FORM_INVALID
+ end
+ else
+ self.state = FORM_NODATA
+ end
+
+ return self.state
end
function Map.render(self, ...)
end
function Map.render(self, ...)
@@
-423,6
+443,7
@@
function SimpleForm.__init__(self, config, title, description, data)
self.data = data or {}
self.template = "cbi/simpleform"
self.dorender = true
self.data = data or {}
self.template = "cbi/simpleform"
self.dorender = true
+ self.pageaction = false
end
function SimpleForm.parse(self, ...)
end
function SimpleForm.parse(self, ...)
@@
-440,11
+461,12
@@
function SimpleForm.parse(self, ...)
end
local state =
end
local state =
- not
luci.http.formvalue("cbi.submit") and 0
- or valid and
1
- or
-1
+ not
self:submitstate() and FORM_NODATA
+ or valid and
FORM_VALID
+ or
FORM_INVALID
self.dorender = not self.handle or self:handle(state, self.data) ~= false
self.dorender = not self.handle or self:handle(state, self.data) ~= false
+ return state
end
function SimpleForm.render(self, ...)
end
function SimpleForm.render(self, ...)
@@
-453,6
+475,10
@@
function SimpleForm.render(self, ...)
end
end
end
end
+function SimpleForm.submitstate(self)
+ return luci.http.formvalue("cbi.submit")
+end
+
function SimpleForm.section(self, class, ...)
if instanceof(class, AbstractSection) then
local obj = class(self, ...)
function SimpleForm.section(self, class, ...)
if instanceof(class, AbstractSection) then
local obj = class(self, ...)
@@
-523,6
+549,7
@@
function AbstractSection.__init__(self, map, sectiontype, ...)
self.tag_error = {}
self.tag_invalid = {}
self.tag_deperror = {}
self.tag_error = {}
self.tag_invalid = {}
self.tag_deperror = {}
+ self.changed = false
self.optional = true
self.addremove = false
self.optional = true
self.addremove = false
@@
-622,6
+649,12
@@
function AbstractSection.cfgvalue(self, section)
return self.map:get(section)
end
return self.map:get(section)
end
+-- Push events
+function AbstractSection.push_events(self)
+ --luci.util.append(self.map.events, self.events)
+ self.map.changed = true
+end
+
-- Removes the section
function AbstractSection.remove(self, section)
return self.map:del(section)
-- Removes the section
function AbstractSection.remove(self, section)
return self.map:del(section)
@@
-672,6
+705,10
@@
function Table.__init__(self, form, data, ...)
function datasource.get(self, section, option)
return data[section] and data[section][option]
end
function datasource.get(self, section, option)
return data[section] and data[section][option]
end
+
+ function datasource.submitstate(self)
+ return luci.http.formvalue("cbi.submit")
+ end
function datasource.del(...)
return true
function datasource.del(...)
return true
@@
-689,7
+726,7
@@
end
function Table.parse(self)
for i, k in ipairs(self:cfgsections()) do
function Table.parse(self)
for i, k in ipairs(self:cfgsections()) do
- if
luci.http.formvalue("cbi.submit"
) then
+ if
self.map:submitstate(
) then
Node.parse(self, k)
end
end
Node.parse(self, k)
end
end
@@
-752,7
+789,7
@@
function NamedSection.parse(self, novld)
if active then
AbstractSection.parse_dynamic(self, s)
if active then
AbstractSection.parse_dynamic(self, s)
- if
luci.http.formvalue("cbi.submit"
) then
+ if
self.map:submitstate(
) then
Node.parse(self, s)
if not novld and not self.override_scheme and self.map.scheme then
Node.parse(self, s)
if not novld and not self.override_scheme and self.map.scheme then
@@
-760,6
+797,10
@@
function NamedSection.parse(self, novld)
end
end
AbstractSection.parse_optionals(self, s)
end
end
AbstractSection.parse_optionals(self, s)
+
+ if self.changed then
+ self:push_events()
+ end
end
end
end
end
@@
-827,7
+868,7
@@
function TypedSection.parse(self, novld)
local co
for i, k in ipairs(self:cfgsections()) do
AbstractSection.parse_dynamic(self, k)
local co
for i, k in ipairs(self:cfgsections()) do
AbstractSection.parse_dynamic(self, k)
- if
luci.http.formvalue("cbi.submit"
) then
+ if
self.map:submitstate(
) then
Node.parse(self, k)
if not novld and not self.override_scheme and self.map.scheme then
Node.parse(self, k)
if not novld and not self.override_scheme and self.map.scheme then
@@
-872,6
+913,10
@@
function TypedSection.parse(self, novld)
AbstractSection.parse_optionals(self, created)
end
end
AbstractSection.parse_optionals(self, created)
end
end
+
+ if created or self.changed then
+ self:push_events()
+ end
end
-- Verifies scope of sections
end
-- Verifies scope of sections
@@
-1015,11
+1060,19
@@
function AbstractValue.parse(self, section)
self.tag_invalid[section] = true
end
if fvalue and not (fvalue == cvalue) then
self.tag_invalid[section] = true
end
if fvalue and not (fvalue == cvalue) then
- self:write(section, fvalue)
+ if self:write(section, fvalue) then
+ -- Push events
+ self.section.changed = true
+ --luci.util.append(self.map.events, self.events)
+ end
end
else -- Unset the UCI or error
if self.rmempty or self.optional then
end
else -- Unset the UCI or error
if self.rmempty or self.optional then
- self:remove(section)
+ if self:remove(section) then
+ -- Push events
+ self.section.changed = true
+ --luci.util.append(self.map.events, self.events)
+ end
elseif self.track_missing and (not fvalue or fvalue ~= cvalue) then
self.tag_missing[section] = true
end
elseif self.track_missing and (not fvalue or fvalue ~= cvalue) then
self.tag_missing[section] = true
end
@@
-1396,6
+1449,12
@@
function FileUpload.__init__(self, ...)
end
end
end
end
+function FileUpload.formcreated(self, section)
+ return AbstractValue.formcreated(self, section) or
+ luci.http.formvalue("cbi.rlf."..section.."."..self.option) or
+ luci.http.formvalue("cbi.rlf."..section.."."..self.option..".x")
+end
+
function FileUpload.cfgvalue(self, section)
local val = AbstractValue.cfgvalue(self, section)
if val and luci.fs.access(val) then
function FileUpload.cfgvalue(self, section)
local val = AbstractValue.cfgvalue(self, section)
if val and luci.fs.access(val) then
@@
-1423,3
+1482,11
@@
function FileUpload.remove(self, section)
if val and luci.fs.access(val) then luci.fs.unlink(val) end
return AbstractValue.remove(self, section)
end
if val and luci.fs.access(val) then luci.fs.unlink(val) end
return AbstractValue.remove(self, section)
end
+
+
+FileBrowser = class(AbstractValue)
+
+function FileBrowser.__init__(self, ...)
+ AbstractValue.__init__(self, ...)
+ self.template = "cbi/browser"
+end