mirror of
https://github.com/openwrt/luci.git
synced 2026-06-17 14:50:21 +04:00
luci-app-ocserv: correct JSON user data
follow-up to 4a2623038a
Should help users like #8571
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
@@ -62,11 +62,11 @@ return L.view.extend({
|
||||
id: entry.ID,
|
||||
user: entry?.Username || entry?.User,
|
||||
group: entry?.Groupname || entry?.Group,
|
||||
vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'],
|
||||
vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'],
|
||||
ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'],
|
||||
vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.IPv4,
|
||||
vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.IPv6,
|
||||
ip: entry?.['Remote IP'],
|
||||
device: entry?.Device,
|
||||
time: entry?.raw_connected_at || entry['Connected at'],
|
||||
time: entry['_Connected at'] || entry?.raw_connected_at,
|
||||
cipher: entry?.Cipher || entry?.['TLS ciphersuite'],
|
||||
status: entry?.Status || entry?.State,
|
||||
tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx,
|
||||
|
||||
+4
-4
@@ -49,11 +49,11 @@ return baseclass.extend({
|
||||
id: entry.ID,
|
||||
user: entry?.Username || entry?.User,
|
||||
group: entry?.Groupname || entry?.Group,
|
||||
vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.['P-t-P IPv4'],
|
||||
vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.['P-t-P IPv6'],
|
||||
ip: entry?.IPv4 || entry?.IPv6 || entry?.['Remote IP'],
|
||||
vpn_ip: entry['vpn-ipv4'] || entry.vpn_ip || entry?.IPv4,
|
||||
vpn_ip6: entry['vpn-ipv6'] || entry.vpn_ip6 || entry?.IPv6,
|
||||
ip: entry?.['Remote IP'],
|
||||
device: entry?.Device,
|
||||
time: entry?.raw_connected_at || entry['Connected at'],
|
||||
time: entry['_Connected at'] || entry?.raw_connected_at,
|
||||
cipher: entry?.Cipher || entry?.['TLS ciphersuite'],
|
||||
status: entry?.Status || entry?.State,
|
||||
tx: entry?._TX || entry?.TX || entry?.tx || entry?.raw_tx,
|
||||
|
||||
Reference in New Issue
Block a user