From 53e6f8d3c95ab2df1199c4b38100cb5a3b2183d9 Mon Sep 17 00:00:00 2001 From: bashmak Date: Sat, 8 Apr 2017 16:13:57 +0300 Subject: [PATCH] fixbug --- abonapp/locale/ru/LC_MESSAGES/django.po | 3 +++ devapp/views.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 15ed97a..f5f7edd 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -711,3 +711,6 @@ msgstr "Удалить" msgid "Instance of a option82 unexpectiadly disappeared" msgstr "Экземпляр option82 неожиданно исчез из базы" + +msgid "SNMP error on device" +msgstr "Ошибка в SNMP на устройстве" diff --git a/devapp/views.py b/devapp/views.py index c80dfe1..01d65b3 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -4,7 +4,7 @@ from django.core.exceptions import PermissionDenied from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.contrib import messages from django.utils.translation import ugettext_lazy as _ -from easysnmp import EasySNMPTimeoutError +from easysnmp import EasySNMPTimeoutError, EasySNMPError from .models import Device from mydefs import pag_mn, res_success, res_error, only_admins, ping, order_helper @@ -36,7 +36,7 @@ def devices(request, grp): @login_required @only_admins def devices_null_group(request): - devs = Device.objects.all() + devs = Device.objects.filter(user_group=None) # фильтр dr, field = order_helper(request) if field: @@ -114,6 +114,8 @@ def devview(request, did): messages.error(request, _('Dot was not pinged')) except EasySNMPTimeoutError: messages.error(request, _('wait for a reply from the SNMP Timeout')) + except EasySNMPError: + messages.error(request, _('SNMP error on device')) return render(request, 'devapp/ports.html', { 'dev': dev,