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

luci-mod-status: disable "Set static" lease action on readonly view

Browse source 
Fixes: f6b6a12927 ("luci-mod-status: add support for one-click static lease")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-07-07 17:14:15 +02:00
parent 9922c838cd
commit a6d957d6f5
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
View file

@ -21,7 +21,7 @@ return baseclass.extend({
return Promise.all([ return Promise.all([
callLuciDHCPLeases(), callLuciDHCPLeases(),
network.getHostHints(), network.getHostHints(),
uci.load('dhcp') L.resolveDefault(uci.load('dhcp'))
]); ]);
}, },
@ -63,7 +63,8 @@ return baseclass.extend({
var leases = Array.isArray(data[0].dhcp_leases) ? data[0].dhcp_leases : [], var leases = Array.isArray(data[0].dhcp_leases) ? data[0].dhcp_leases : [],
leases6 = Array.isArray(data[0].dhcp6_leases) ? data[0].dhcp6_leases : [], leases6 = Array.isArray(data[0].dhcp6_leases) ? data[0].dhcp6_leases : [],
machints = data[1].getMACHints(false), machints = data[1].getMACHints(false),
hosts = uci.sections('dhcp', 'host'); hosts = uci.sections('dhcp', 'host'),
isReadonlyView = !L.hasViewPermission();
for (var i = 0; i < hosts.length; i++) { for (var i = 0; i < hosts.length; i++) {
var host = hosts[i]; var host = hosts[i];
@ -87,7 +88,7 @@ return baseclass.extend({
E('th', { 'class': 'th' }, _('IPv4 address')), E('th', { 'class': 'th' }, _('IPv4 address')),
E('th', { 'class': 'th' }, _('MAC address')), E('th', { 'class': 'th' }, _('MAC address')),
E('th', { 'class': 'th' }, _('Lease time remaining')), E('th', { 'class': 'th' }, _('Lease time remaining')),
E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease')) isReadonlyView ? E([]) : E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
]) ])
]); ]);
@ -108,7 +109,7 @@ return baseclass.extend({
exp exp
]; ];
if (lease.macaddr != null) { if (!isReadonlyView && lease.macaddr != null) {
var mac = lease.macaddr.toUpperCase(); var mac = lease.macaddr.toUpperCase();
rows.push(E('button', { rows.push(E('button', {
'class': 'cbi-button cbi-button-apply', 'class': 'cbi-button cbi-button-apply',
@ -126,7 +127,7 @@ return baseclass.extend({
E('th', { 'class': 'th' }, _('IPv6 address')), E('th', { 'class': 'th' }, _('IPv6 address')),
E('th', { 'class': 'th' }, _('DUID')), E('th', { 'class': 'th' }, _('DUID')),
E('th', { 'class': 'th' }, _('Lease time remaining')), E('th', { 'class': 'th' }, _('Lease time remaining')),
E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease')) isReadonlyView ? E([]) : E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
]) ])
]); ]);
@ -157,7 +158,7 @@ return baseclass.extend({
exp exp
]; ];
if (lease.duid != null) { if (!isReadonlyView && lease.duid != null) {
var duid = lease.duid.toUpperCase(); var duid = lease.duid.toUpperCase();
rows.push(E('button', { rows.push(E('button', {
'class': 'cbi-button cbi-button-apply', 'class': 'cbi-button cbi-button-apply',

3
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
View file

@ -104,6 +104,9 @@
"file": [ "list", "read" ], "file": [ "list", "read" ],
"system": [ "board", "info" ] "system": [ "board", "info" ]
} }
},
"write": {
"uci": [ "dhcp" ]
} }
}, },