Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3962 from janh/vnstat2-acl

Browse source 
luci-app-vnstat2: fix ACL rules, disable button on insufficient ACLs
This commit is contained in:
Jo-Philipp Wich 2020-04-24 22:45:29 +02:00 committed by GitHub
commit 8f67311c26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
View file

@ -8,6 +8,8 @@
'require form'; 'require form';
'require tools.widgets as widgets'; 'require tools.widgets as widgets';
var isReadonlyView = !L.hasViewPermission() || null;
return view.extend({ return view.extend({
handleDeleteModal: function(m, iface, ev) { handleDeleteModal: function(m, iface, ev) {
L.showModal(_('Delete interface <em>%h</em>').format(iface), [ L.showModal(_('Delete interface <em>%h</em>').format(iface), [
@ -88,7 +90,8 @@ return view.extend({
this.interfaces[i], this.interfaces[i],
E('button', { E('button', {
'class': 'btn cbi-button-remove', 'class': 'btn cbi-button-remove',
'click': ui.createHandlerFn(view, 'handleDeleteModal', m, this.interfaces[i]) 'click': ui.createHandlerFn(view, 'handleDeleteModal', m, this.interfaces[i]),
'disabled': isReadonlyView
}, [ _('Delete…') ]) }, [ _('Delete…') ])
]); ]);
} }

3
applications/luci-app-vnstat2/root/usr/share/rpcd/acl.d/luci-app-vnstat2.json
View file

@ -6,7 +6,8 @@
"file": { "file": {
"/usr/bin/vnstat --json f 1": [ "exec" ], "/usr/bin/vnstat --json f 1": [ "exec" ],
"/usr/bin/vnstati -[5dhmsty] -i * -o -": [ "exec" ] "/usr/bin/vnstati -[5dhmsty] -i * -o -": [ "exec" ]
} },
"uci": [ "vnstat" ]
}, },
"write": { "write": {
"file": { "file": {