diff options
| author | Stan Grishin <stangri@melmac.ca> | 2022-11-07 16:41:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 16:41:11 -0800 |
| commit | 98842ccee86c6db191434484fb85126124844ab0 (patch) | |
| tree | cc28ad22e769b0cf047cf115a62be457cb290f07 /applications/luci-app-simple-adblock/root/usr/share | |
| parent | 740952373f21f066d8c49543b6f1cd81f9131191 (diff) | |
| parent | 0b895b17940089f854221b340fafae83bcbb2a99 (diff) | |
Merge pull request #6075 from stangri/master-luci-app-simple-adblock
luci-app-simple-adblock: convert to js
Diffstat (limited to 'applications/luci-app-simple-adblock/root/usr/share')
2 files changed, 21 insertions, 32 deletions
diff --git a/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json b/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json index e640dbb871..b2cdca18eb 100644 --- a/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json +++ b/applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json @@ -2,13 +2,16 @@ "admin/services/simple-adblock": { "title": "Simple AdBlock", "action": { - "type": "cbi", - "path": "simple-adblock", - "post": { "cbi.submit": true } + "type": "view", + "path": "simple-adblock/overview" }, "depends": { - "acl": [ "luci-app-simple-adblock" ], - "uci": { "simple-adblock": true } + "acl": [ + "luci-app-simple-adblock" + ], + "uci": { + "simple-adblock": true + } } } } diff --git a/applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json b/applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json index 4635626615..6aeadc9c63 100644 --- a/applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json +++ b/applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json @@ -2,40 +2,26 @@ "luci-app-simple-adblock": { "description": "Grant UCI and file access for luci-app-simple-adblock", "read": { - "cgi-io": [ - "exec" - ], - "file": { - "/usr/lib/opkg/status": [ - "read" - ], - "/sys/class/leds/*": [ - "read" - ], - "/var/run/simple-adblock.*": [ - "read" - ], - "/etc/init.d/simple-adblock *": [ - "exec" - ], - "/usr/sbin/dnsmasq *": [ - "exec" - ], - "/usr/sbin/unbound *": [ - "exec" - ], - "/usr/sbin/ipset *": [ - "exec" + "ubus": { + "luci.simple-adblock": [ + "getInitList", + "getInitStatus", + "getPlatformSupport" ] }, - "uci": [ + "uci": [ "simple-adblock" ] }, "write": { "uci": [ "simple-adblock" - ] + ], + "ubus": { + "luci.simple-adblock": [ + "setInitAction" + ] + } } } -}
\ No newline at end of file +} |