luci-app: Fixed tools.js, ACL

This commit is contained in:
gSpot
2022-01-06 00:49:07 +03:00
parent 6756bbc2df
commit ed861c32c2
3 changed files with 59 additions and 59 deletions
@@ -202,7 +202,7 @@ return baseclass.extend({
}, },
load: function() { load: function() {
return fs.read(this.file); return L.resolveDefault(fs.read(this.file), '');
}, },
render: function(content) { render: function(content) {
@@ -219,7 +219,7 @@ return baseclass.extend({
'wrap': 'off', 'wrap': 'off',
'spellcheck': 'false', 'spellcheck': 'false',
}, },
content || '') content)
) )
), ),
]), ]),
@@ -1,63 +1,63 @@
{ {
"admin/services/ruantiblock": { "admin/services/ruantiblock": {
"title": "Ruantiblock", "title": "Ruantiblock",
"order": 60, "order": 60,
"action": { "action": {
"type": "alias", "type": "alias",
"path": "admin/services/ruantiblock/service" "path": "admin/services/ruantiblock/service"
}, },
"depends": { "depends": {
"acl": [ "luci-app-ruantiblock" ], "acl": [ "luci-app-ruantiblock" ],
"fs": { "fs": {
"/usr/bin/ruantiblock": "executable", "/usr/bin/ruantiblock": "executable",
"/etc/init.d/ruantiblock": "executable" "/etc/init.d/ruantiblock": "executable"
}, },
"uci": { "ruantiblock": true } "uci": { "ruantiblock": true }
} }
}, },
"admin/services/ruantiblock/service": { "admin/services/ruantiblock/service": {
"title": "Service", "title": "Service",
"order": 10, "order": 10,
"action": { "action": {
"type": "view", "type": "view",
"path": "ruantiblock/service" "path": "ruantiblock/service"
} }
}, },
"admin/services/ruantiblock/settings": { "admin/services/ruantiblock/settings": {
"title": "Settings", "title": "Settings",
"order": 20, "order": 20,
"action": { "action": {
"type": "view", "type": "view",
"path": "ruantiblock/settings" "path": "ruantiblock/settings"
} }
}, },
"admin/services/ruantiblock/cron": { "admin/services/ruantiblock/cron": {
"title": "Blacklist updates", "title": "Blacklist updates",
"order": 30, "order": 30,
"action": { "action": {
"type": "view", "type": "view",
"path": "ruantiblock/cron" "path": "ruantiblock/cron"
} }
}, },
"admin/services/ruantiblock/info": { "admin/services/ruantiblock/info": {
"title": "Statistics", "title": "Statistics",
"order": 40, "order": 40,
"action": { "action": {
"type": "view", "type": "view",
"path": "ruantiblock/info" "path": "ruantiblock/info"
} }
}, },
"admin/services/ruantiblock/log": { "admin/services/ruantiblock/log": {
"title": "Log", "title": "Log",
"order": 50, "order": 50,
"action": { "action": {
"type": "view", "type": "view",
"path": "ruantiblock/log" "path": "ruantiblock/log"
} }
} }
} }
@@ -4,7 +4,7 @@
"read": { "read": {
"cgi-io": [ "exec" ], "cgi-io": [ "exec" ],
"file": { "file": {
"/usr/bin": [ "list" ], "/usr/libexec/ruantiblock": [ "list" ],
"/etc/ruantiblock/fqdn_filter": [ "read" ], "/etc/ruantiblock/fqdn_filter": [ "read" ],
"/etc/ruantiblock/ip_filter": [ "read" ], "/etc/ruantiblock/ip_filter": [ "read" ],
"/etc/ruantiblock/user_entries": [ "read" ], "/etc/ruantiblock/user_entries": [ "read" ],