From 66f67e4a2bf0d81009b8a48a9452a267316bb90f Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Thu, 23 Aug 2018 23:36:27 +0300
Subject: [PATCH 1/2] Fix users Dialing page

---
 abonapp/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/abonapp/views.py b/abonapp/views.py
index 9f6a408..896f14f 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -755,12 +755,14 @@ class DialsListView(OrderedFilteredList):
         self.abon = abon
         if abon.telephone is not None and abon.telephone != '':
             tel = abon.telephone.replace('+', '')
+            additional_tels = tuple(t.telephone for t in models.AdditionalTelephone.objects.filter(abon=abon).iterator())
             logs = AsteriskCDR.objects.filter(
-                Q(src__contains=tel) | Q(dst__contains=tel)
+                Q(src__contains=tel) | Q(dst__contains=tel) |
+                Q(src__in=additional_tels) | Q(dst__in=additional_tels)
             )
             return logs
         else:
-            return AsteriskCDR.objects.empty()
+            return AsteriskCDR.objects.none()
 
     def get_context_data(self, **kwargs):
         context = super(DialsListView, self).get_context_data(**kwargs)

From 6abe058775fd6097f93f46ecf387e85de6877c7d Mon Sep 17 00:00:00 2001
From: www-data <www-data@is-ttk@ya.ru>
Date: Thu, 23 Aug 2018 23:39:06 +0300
Subject: [PATCH 2/2] Add more readable log if account has no active leases

---
 abonapp/locale/ru/LC_MESSAGES/django.po | 4 ++--
 abonapp/models.py                       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index cd4b848..a36cae2 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -211,8 +211,8 @@ msgid "Buy service default log"
 msgstr "Покупка тарифного плана через админку"
 
 #: models.py:228
-msgid "You have not any active leases"
-msgstr "Учётная запись не имеет ни одной активной сессии"
+msgid "Account %(username)s not have any active leases"
+msgstr "Учётная зап� %(username)s�сь не имеет ни одной активной сессии"
 
 #: models.py:236 models.py:253 models.py:270 views.py:667 views.py:1100
 #: views.py:1143
diff --git a/abonapp/models.py b/abonapp/models.py
index 4e9c247..f0b4607 100644
--- a/abonapp/models.py
+++ b/abonapp/models.py
@@ -225,7 +225,9 @@ class Abon(BaseAccount):
             agent_trf = TariffStruct(trf.id, trf.speedIn, trf.speedOut)
         if len(abon_addresses) > 0:
             return AbonStruct(self.pk, abon_addresses, agent_trf, self.is_access())
-        raise LogicError(_('You have not any active leases'))
+        raise LogicError(_('Account "%(username)s" not have any active leases') % {
+            'username': self.username
+        })
 
     def nas_sync_self(self) -> Optional[Exception]:
         """