Merge branch 'devel' into tmp_pay_forward

ip_pool/locale/ru/LC_MESSAGES/django.po

@@ -167,10 +167,6 @@ msgstr "Подсеть"
 msgid "Networks"
 msgstr "Подсети"
 
-#: models.py:153
-msgid "Ip has already taken"
-msgstr "IP уже занят"
-
 #: models.py:166
 msgid "Parent network"
 msgstr "Родительская подсеть"

ip_pool/models.py

@@ -149,9 +149,7 @@ class IpLeaseManager(models.Manager):
                 mac_addr=mac
             )
         except IntegrityError as e:
-            if 'Duplicate entry' in str(e):
-                raise DuplicateEntry("%s: %s" %(_('Ip has already taken'), str(e)))
-            raise e
+            raise DuplicateEntry(e)
 
     def expired(self):
         lease_live_time = getattr(settings, 'LEASE_LIVE_TIME')
@@ -163,7 +161,8 @@ class IpLeaseManager(models.Manager):
 
 class IpLeaseModel(models.Model):
     ip = models.GenericIPAddressField(verbose_name=_('Ip address'), unique=True)
-    network = models.ForeignKey(NetworkModel, on_delete=models.CASCADE, verbose_name=_('Parent network'), null=True, blank=True)
+    network = models.ForeignKey(NetworkModel, on_delete=models.CASCADE,
+                                verbose_name=_('Parent network'), null=True, blank=True)
     mac_addr = MACAddressField(verbose_name=_('Mac address'), null=True, blank=True, unique=True)
     lease_time = models.DateTimeField(_('Lease time'), auto_now_add=True)
     is_dynamic = models.BooleanField(_('Is dynamic'), default=False)