From f5778b359a322c95297462965a463ad966f9cad3 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 22 Jan 2019 12:40:08 +0300 Subject: [PATCH] fix device view --- devapp/views.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/devapp/views.py b/devapp/views.py index 5e5310f..4e7a45f 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -470,20 +470,19 @@ def devview(request, group_id: int, device_id: int): template_name = 'generic_switch.html' try: - if device.ip_address: - if ping(str(device.ip_address)): - if device.man_passw: - manager = device.get_manager_object() - ports = tuple(manager.get_ports()) - if ports is not None and len(ports) > 0 and isinstance(ports[0], - Exception): - messages.error(request, ports[0]) - ports = ports[1] - template_name = manager.get_template_name() - else: - messages.warning(request, _('Not Set snmp device password')) - else: - messages.error(request, _('Dot was not pinged')) + if device.ip_address and not ping(str(device.ip_address)): + messages.error(request, _('Dot was not pinged')) + if device.man_passw: + manager = device.get_manager_object() + ports = tuple(manager.get_ports()) + if ports is not None and len(ports) > 0 and isinstance(ports[0], + Exception): + messages.error(request, ports[0]) + ports = ports[1] + template_name = manager.get_template_name() + else: + messages.warning(request, _('Not Set snmp device password')) + return render(request, 'devapp/custom_dev_page/' + template_name, { 'dev': device, 'ports': ports,