projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs: move http.protocol.{date,mime,conditionals} to luci-lib-httpprotoutils
[project/luci.git]
/
modules
/
luci-base
/
luasrc
/
model
/
uci.lua
diff --git
a/modules/luci-base/luasrc/model/uci.lua
b/modules/luci-base/luasrc/model/uci.lua
index
bbd9b4c
..
0e3950c
100644
(file)
--- a/
modules/luci-base/luasrc/model/uci.lua
+++ b/
modules/luci-base/luasrc/model/uci.lua
@@
-182,11
+182,11
@@
function foreach(self, config, stype, callback)
end
end
end
end
-
function get(self
, config, section, option)
+
local function _get(self, operation
, config, section, option)
if section == nil then
return nil
elseif type(option) == "string" and option:byte(1) ~= 46 then
if section == nil then
return nil
elseif type(option) == "string" and option:byte(1) ~= 46 then
- local rv, err = util.ubus("uci",
"get"
, {
+ local rv, err = util.ubus("uci",
operation
, {
config = config,
section = section,
option = option
config = config,
section = section,
option = option
@@
-211,6
+211,14
@@
function get(self, config, section, option)
end
end
end
end
+function get(self, ...)
+ return _get(self, "get", ...)
+end
+
+function get_state(self, ...)
+ return _get(self, "state", ...)
+end
+
function get_all(self, config, section)
local rv, err = util.ubus("uci", "get", {
config = config,
function get_all(self, config, section)
local rv, err = util.ubus("uci", "get", {
config = config,
@@
-234,7
+242,7
@@
end
function get_first(self, config, stype, option, default)
local rv = default
function get_first(self, config, stype, option, default)
local rv = default
- self:foreach(conf, stype, function(s)
+ self:foreach(conf
ig
, stype, function(s)
local val = not option and s[".name"] or s[option]
if type(default) == "number" then
local val = not option and s[".name"] or s[option]
if type(default) == "number" then