luci-app-adblock: support new workflow

[project/luci.git] / applications / luci-app-adblock / luasrc / model / cbi / adblock / overview_tab.lua

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 67d593c..ec5a75c 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -7,7 +7,7 @@ local sys      = require("luci.sys")
 local util     = require("luci.util")
 local dump     = util.ubus("network.interface", "dump", {})
 local json     = require("luci.jsonc")
 local util     = require("luci.util")
 local dump     = util.ubus("network.interface", "dump", {})
 local json     = require("luci.jsonc")

-local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json"
+local adbinput = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json"

 
 if not uci:get("adblock", "extra") then
        m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />")
 
 if not uci:get("adblock", "extra") then
        m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />")


@@ -24,8 +24,9 @@ m = Map("adblock", translate("Adblock"),
        .. translatef("For further information "
        .. "<a href=\"%s\" target=\"_blank\">"
        .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
        .. translatef("For further information "
        .. "<a href=\"%s\" target=\"_blank\">"
        .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))

+m.apply_on_parse = true

 
 

-function m.on_after_commit(self)
+function m.on_apply(self)

        luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
        luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
 end
        luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
        luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
 end


@@ -232,7 +233,7 @@ e6.default = e6.disabled
 e6.rmempty = true
 
 e7 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
 e6.rmempty = true
 
 e7 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),

-       translate("Size of the download queue to handle downloads & list processing in parallel (default '4').<br />")
+       translate("Size of the download queue to handle downloads &amp; list processing in parallel (default '4').<br />")

        .. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
 e7.default = 4
 e7.datatype = "range(1,32)"
        .. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
 e7.default = 4
 e7.datatype = "range(1,32)"


@@ -251,7 +252,7 @@ e9.rmempty = true
 
 e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
        translate("Send notification emails in case of a processing error or if domain count is &le; 0.<br />")
 
 e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
        translate("Send notification emails in case of a processing error or if domain count is &le; 0.<br />")

-       .. translate("Please note: this needs additional 'mstmp' package installation and setup."))
+       .. translate("Please note: this needs additional 'msmtp' package installation and setup."))

 e10.default = e10.disabled
 e10.rmempty = true
 
 e10.default = e10.disabled
 e10.rmempty = true