From eedbe7bbfce321efde5b3784b6d9aa15d2909ed1 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 3 Oct 2018 14:03:37 +0300 Subject: [PATCH] fix --- ip_pool/locale/ru/LC_MESSAGES/django.po | 4 ---- ip_pool/models.py | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ip_pool/locale/ru/LC_MESSAGES/django.po b/ip_pool/locale/ru/LC_MESSAGES/django.po index c835621..b148917 100644 --- a/ip_pool/locale/ru/LC_MESSAGES/django.po +++ b/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 "Родительская подсеть" diff --git a/ip_pool/models.py b/ip_pool/models.py index cf7792d..7e87166 100644 --- a/ip_pool/models.py +++ b/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)