summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/controller/admin/uci.lua
diff options
context:
space:
mode:
Diffstat (limited to 'modules/admin-full/luasrc/controller/admin/uci.lua')
-rw-r--r--modules/admin-full/luasrc/controller/admin/uci.lua18
1 files changed, 10 insertions, 8 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua
index 5dd0aaf6e2..f5a45707c5 100644
--- a/modules/admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/admin-full/luasrc/controller/admin/uci.lua
@@ -48,7 +48,7 @@ function convert_changes(changes)
end
function action_changes()
- local changes = convert_changes(luci.model.uci.changes())
+ local changes = convert_changes(luci.model.uci.cursor():changes())
luci.template.render("admin_uci/changes", {changes=changes})
end
@@ -56,6 +56,7 @@ function action_apply()
local path = luci.dispatcher.context.path
local changes = luci.model.uci.changes()
local output = ""
+ local uci = luci.model.uci.cursor()
if changes then
local com = {}
@@ -65,9 +66,9 @@ function action_apply()
for r, tbl in pairs(changes) do
if r then
if path[#path] ~= "apply" then
- luci.model.uci.load_config(r)
- luci.model.uci.commit(r)
- luci.model.uci.unload(r)
+ uci:load(r)
+ uci:commit(r)
+ uci:unload(r)
end
if luci.config.uci_oncommit and luci.config.uci_oncommit[r] then
run[luci.config.uci_oncommit[r]] = true
@@ -87,15 +88,16 @@ end
function action_revert()
- local changes = luci.model.uci.changes()
+ local uci = luci.model.uci.cursor()
+ local changes = uci:changes()
if changes then
local revert = {}
-- Collect files to be reverted
for r, tbl in pairs(changes) do
- luci.model.uci.load_config(r)
- luci.model.uci.revert(r)
- luci.model.uci.unload(r)
+ uci:load(r)
+ uci:revert(r)
+ uci:unload(r)
end
end