KumiSystems/vpnmanager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix display for networks without common name

Browse source
This commit is contained in:
Kumi 2019-01-17 09:47:41 +01:00
parent 243fe5c6a5
commit edcf42eff7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manager/views.py
View file

@ -234,7 +234,7 @@ def ping(request, device_id):
ajax += ',\n "network": {' ajax += ',\n "network": {'
ajax += '\n "intip": "%s"' % device[0].network.intip ajax += '\n "intip": "%s"' % device[0].network.intip
ajax += ',\n "extip": "%s"' % device[0].network.extip ajax += ',\n "extip": "%s"' % device[0].network.extip
ajax += ',\n "name": "%s"' % device[0].network.name ajax += ',\n "name": "%s"' % (device[0].network.name if device[0].network.name else "")
ajax += '\n }' ajax += '\n }'
except Exception as e: except Exception as e:

2
static/js/devices.js
View file

@ -30,7 +30,7 @@ function styleStatus(msg, device) {
}; };
if (msg.hasOwnProperty("network")) { if (msg.hasOwnProperty("network")) {
device_network.text(msg.network.intip + " (" + msg.network.name + ")"); device_network.text(msg.network.intip + (msg.network.name ? (" (" + msg.network.name + ")") : ""));
}; };
if (msg.hasOwnProperty("reboot")) { if (msg.hasOwnProperty("reboot")) {