luci-app-adblock: change "refresh" action

* change "refresh" action to fix potential white-/blacklist issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit a392dbf888f0cdaee211eca9b58becc804ee3458)

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 8b5e00f4b1d839f3058f955ccec934a510f3215c..47213856dae6996ca86d52fd83aa7ed34475e7df 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -250,7 +250,7 @@ return L.view.extend({
                                        E('button', {
                                                'class': 'cbi-button cbi-button-apply',
                                                'click': ui.createHandlerFn(this, function() {
-                                                       return handleAction('start');
+                                                       return handleAction('reload');
                                                })
                                        }, [ _('Refresh') ])
                                ])

diff --git a/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
index 557e5328c39483d3cb8779c6ee216211a231cb2d..3a6e391e32635f2a5087e344ba5c25701faddfd3 100644 (file)
--- a/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
+++ b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
@@ -18,7 +18,7 @@
                                "/sbin/logread -e adblock-": [ "exec" ],
                                "/usr/sbin/logread -e adblock-": [ "exec" ],
                                "/etc/init.d/adblock list" : [ "exec" ],
-                               "/etc/init.d/adblock start" : [ "exec" ],
+                               "/etc/init.d/adblock reload" : [ "exec" ],
                                "/etc/init.d/adblock suspend" : [ "exec" ],
                                "/etc/init.d/adblock resume" : [ "exec" ],
                                "/etc/init.d/adblock report * [0-9]* [a-z]* json" : [ "exec" ],