Fixed a design flaw in luci.model.uci

[project/luci.git] / modules / admin-mini / luasrc / controller / mini / uci.lua

diff --git a/modules/admin-mini/luasrc/controller/mini/uci.lua b/modules/admin-mini/luasrc/controller/mini/uci.lua
index eabc895..9b57fe3 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/uci.lua
+++ b/modules/admin-mini/luasrc/controller/mini/uci.lua
@@ -18,9 +18,9 @@ function index()
        local i18n = luci.i18n.translate
        
        entry({"mini", "uci"}, nil, i18n("config"))
-       entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"))
-       entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"))
-       entry({"mini", "uci", "apply"}, call("action_apply"), i18n("apply"))
+       entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"), 30)
+       entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"), 20)
+       entry({"mini", "uci", "apply"}, call("action_apply"), i18n("saveapply"), 10)
 end
 
 function convert_changes(changes)
@@ -34,7 +34,7 @@ function convert_changes(changes)
                                        val = ""
                                else
                                        str = ""
-                                       val = "="..v
+                                       val = "="..luci.util.pcdata(v)
                                end
                                str = r.."."..s
                                if o ~= ".type" then
@@ -63,7 +63,7 @@ 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.load_config(r)
                                luci.model.uci.commit(r)
                                luci.model.uci.unload(r)
                                if luci.config.uci_oncommit and luci.config.uci_oncommit[r] then
@@ -74,7 +74,7 @@ function action_apply()
                
                -- Search for post-commit commands
                for cmd, i in pairs(run) do
-                       output = output .. cmd .. ":" .. luci.sys.exec(cmd) .. "\n"
+                       output = output .. cmd .. ":" .. luci.util.exec(cmd) .. "\n"
                end
        end
        
@@ -90,7 +90,7 @@ function action_revert()
                
                -- Collect files to be reverted
                for r, tbl in pairs(changes) do
-                       luci.model.uci.load(r)
+                       luci.model.uci.load_config(r)
                        luci.model.uci.revert(r)
                        luci.model.uci.unload(r)
                end