diff --git a/src/service/Sysinfo.py b/src/service/Sysinfo.py index 2b07b34..09420df 100644 --- a/src/service/Sysinfo.py +++ b/src/service/Sysinfo.py @@ -124,12 +124,12 @@ def get_all_sysinfo(): "sysinfo_os_version": get_os_version(), "sysinfo_install_directory": get_working_directory() } - network_info = get_network_info() + network_info = get_network_info(all=True) - if isinstance(network_info, dict): - infos["sysinfo_network_interface"] = network_info['interface'] - infos["sysinfo_mac_address"] = network_info['mac_address'] - infos["sysinfo_ip_address"] = network_info['ip_address'] + if isinstance(network_info, list) and len(network_info) > 0: + infos["sysinfo_network_interface"] = ", ".join([iface['interface'] for iface in network_info]) + infos["sysinfo_mac_address"] = ", ".join([iface['mac_address'] for iface in network_info]) + infos["sysinfo_ip_address"] = ", ".join([iface['ip_address'] for iface in network_info]) else: infos["sysinfo_ip_address"] = 'common_unknown_ipaddr' diff --git a/views/player/default.jinja.html b/views/player/default.jinja.html index 279eb2d..2eeb584 100755 --- a/views/player/default.jinja.html +++ b/views/player/default.jinja.html @@ -89,8 +89,9 @@ }; const addIp = function(ip, $container) { - const href = manage_url_template.replace('%ipaddr%', ''+ip+''); - const link = '' + href + ''; + const href_label = manage_url_template.replace('%ipaddr%', ''+ip+''); + const href = manage_url_template.replace('%ipaddr%', ip); + const link = '' + href_label + ''; const $ipaddr = document.createElement('li'); Object.assign($ipaddr, { className: 'ipaddr'}); $ipaddr.innerHTML = link;