Merge branch 'devel' of https://github.com/nerosketch/djing into devel

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'))

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,

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):

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,

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)