zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-nikki: sync upstream

Browse Source 
last commit: 8db4e27cf1
This commit is contained in:
gitea-action 2025-02-24 15:00:28 +08:00
parent 5feb4987e3
commit d768a347c9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-nikki/Makefile
View File

@ -1,6 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.19.1 PKG_VERSION:=1.19.2
LUCI_TITLE:=LuCI Support for nikki LUCI_TITLE:=LuCI Support for nikki
LUCI_DEPENDS:=+luci-base +nikki LUCI_DEPENDS:=+luci-base +nikki

4
luci-app-nikki/htdocs/luci-static/resources/view/nikki/app.js
View File

@ -28,8 +28,8 @@ return view.extend({
}, },
render: function (data) { render: function (data) {
const subscriptions = uci.sections('nikki', 'subscription'); const subscriptions = uci.sections('nikki', 'subscription');
const appVersion = data[1]?.app || ''; const appVersion = data[1].app ?? '';
const coreVersion = data[1]?.core || ''; const coreVersion = data[1].core ?? '';
const running = data[2]; const running = data[2];
const profiles = data[3]; const profiles = data[3];

6
luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
View File

@ -77,7 +77,7 @@ return view.extend({
for (const mac in hosts) { for (const mac in hosts) {
const host = hosts[mac]; const host = hosts[mac];
for (const ip of host.ipaddrs) { for (const ip of host.ipaddrs) {
const hint = host.name || mac; const hint = host.name ?? mac;
o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip); o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip);
}; };
}; };
@ -91,7 +91,7 @@ return view.extend({
for (const mac in hosts) { for (const mac in hosts) {
const host = hosts[mac]; const host = hosts[mac];
for (const ip of host.ip6addrs) { for (const ip of host.ip6addrs) {
const hint = host.name || mac; const hint = host.name ?? mac;
o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip); o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip);
}; };
}; };
@ -104,7 +104,7 @@ return view.extend({
for (const mac in hosts) { for (const mac in hosts) {
const host = hosts[mac]; const host = hosts[mac];
const hint = host.name || host.ipaddrs[0]; const hint = host.name ?? host.ipaddrs[0];
o.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac); o.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
}; };