From b02ade77209aac64edcf378305a1ad78e9ba59e5 Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Sat, 3 Nov 2018 10:43:57 +0300
Subject: [PATCH] fix

---
 abonapp/locale/ru/LC_MESSAGES/django.po | 3 +++
 abonapp/views.py                        | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index 5425e07..f30a5f6 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -1156,3 +1156,6 @@ msgstr "У пользователя нет ip"
 
 msgid "Ip successfully updated"
 msgstr "IP успешно обновлён"
+
+msgid "IP address conflict"
+msgstr "IP адрес уже есть"
diff --git a/abonapp/views.py b/abonapp/views.py
index 8b4975d..a91a2b7 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -594,6 +594,12 @@ class IpUpdateView(LoginAdminPermissionMixin, UpdateView):
             return super(IpUpdateView, self).dispatch(request, *args, **kwargs)
         except lib.LogicError as e:
             messages.error(request, e)
+        except IntegrityError as e:
+            str_text = str(e)
+            if 'abonent_ip_address_nas_id' in str_text and 'duplicate key value' in str_text:
+                messages.error(request, _('IP address conflict'))
+            else:
+                messages.error(request, e)
         return self.render_to_response(self.get_context_data(**kwargs))
 
     def form_valid(self, form):