summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/controller
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-07-29 15:33:28 +0000
committerSteven Barth <steven@midlink.org>2008-07-29 15:33:28 +0000
commitf8f4fe752307e1d0c042496b642aa691589c2a5f (patch)
treef538b93456733a1b8e2d0cfc08a84c72a6d49694 /modules/admin-full/luasrc/controller
parent43ffb3aacbe78fd7ed19217c23438f14acaa27f5 (diff)
modules: Redesigned configuration save, apply, save & apply menu options
Diffstat (limited to 'modules/admin-full/luasrc/controller')
-rw-r--r--modules/admin-full/luasrc/controller/admin/uci.lua16
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua
index 215a13a34b..d2acdeca13 100644
--- a/modules/admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/admin-full/luasrc/controller/admin/uci.lua
@@ -17,9 +17,10 @@ function index()
local i18n = luci.i18n.translate
entry({"admin", "uci"}, nil, i18n("config"))
- entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"))
- entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"))
- entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"))
+ entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"), 40)
+ entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"), 30)
+ entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"), 20)
+ entry({"admin", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10)
end
function convert_changes(changes)
@@ -52,6 +53,7 @@ function action_changes()
end
function action_apply()
+ local path = luci.dispatcher.context.path
local changes = luci.model.uci.changes()
local output = ""
@@ -62,9 +64,11 @@ function action_apply()
-- Collect files to be applied and commit changes
for r, tbl in pairs(changes) do
if r then
- luci.model.uci.load(r)
- luci.model.uci.commit(r)
- luci.model.uci.unload(r)
+ if path[#path] ~= "apply" then
+ luci.model.uci.load(r)
+ luci.model.uci.commit(r)
+ luci.model.uci.unload(r)
+ end
if luci.config.uci_oncommit and luci.config.uci_oncommit[r] then
run[luci.config.uci_oncommit[r]] = true
end