From 884003f903a052669beacdd4e4323cbee064e05a Mon Sep 17 00:00:00 2001 From: www-data Date: Thu, 15 Mar 2018 16:55:37 +0300 Subject: [PATCH] fix bugs --- abonapp/views.py | 3 ++- accounts_app/views.py | 2 +- devapp/base_intr.py | 2 +- devapp/dev_types.py | 2 +- devapp/views.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index 20eea79..f53a3ca 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -583,7 +583,8 @@ def clear_dev(request, gid, uid): try: abon = models.Abon.objects.get(pk=uid) abon.device = None - abon.save(update_fields=['device']) + abon.dev_port = None + abon.save(update_fields=['device', 'dev_port']) messages.success(request, _('Device has successfully unattached')) except models.Abon.DoesNotExist: messages.error(request, _('Abon does not exist')) diff --git a/accounts_app/views.py b/accounts_app/views.py index 1b971b0..0ce76c1 100644 --- a/accounts_app/views.py +++ b/accounts_app/views.py @@ -236,7 +236,7 @@ def perms(request, uid): klasses = ( 'abonapp.AbonGroup', 'abonapp.Abon', 'accounts_app.UserProfile', 'abonapp.AbonTariff', 'abonapp.AbonStreet', 'devapp.Device', - 'abonapp.PassportInfo', 'abonapp.AdditionalTelephone' + 'abonapp.PassportInfo', 'abonapp.AdditionalTelephone', 'tariff_app.PeriodicPay' ) return render(request, 'accounts/perms/objects_types.html', { 'userprofile': userprofile, diff --git a/devapp/base_intr.py b/devapp/base_intr.py index b5576fb..db61a66 100644 --- a/devapp/base_intr.py +++ b/devapp/base_intr.py @@ -73,7 +73,7 @@ class SNMPBaseWorker(object, metaclass=ABCMeta): self.ses = Session(hostname=ip, community=community, version=ver) def set_int_value(self, oid, value): - return self.ses.set(oid, value) + return self.ses.set(oid, value, 'i') def get_list(self, oid): for v in self.ses.walk(oid): diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 244ebd8..4d96ee8 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -52,7 +52,7 @@ class DLinkDevice(DevBase, SNMPBaseWorker): status = True if int(stats[n]) == 1 else False res.append(DLinkPort( n+1, - nams[n] if len(nams) > 0 else _('does not fetch the name'), + nams[n] if len(nams) > 0 else '', status, macs[n] if len(macs) > 0 else _('does not fetch the mac'), int(speeds[n]) if len(speeds) > 0 else 0, diff --git a/devapp/views.py b/devapp/views.py index 7d13476..de8a9c4 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -408,7 +408,7 @@ def toggle_port(request, device_id, portid, status=0): except EasySNMPTimeoutError: messages.error(request, _('wait for a reply from the SNMP Timeout')) except EasySNMPError as e: - messages.error(request, e) + messages.error(request, 'EasySNMPError: %s' % e) return redirect('devapp:view', dev.user_group.pk if dev.user_group is not None else 0, device_id)