From 9026cc97d3a787df921162a179e15e3ebc967809 Mon Sep 17 00:00:00 2001 From: bashmak Date: Wed, 14 Jun 2017 13:11:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4?= =?UTF-8?q?=D1=83=D1=80=D0=B5=20=D0=BF=D0=BE=D1=81=D1=82=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D1=8B=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D1=81=D1=82=D1=80=D0=BE=D0=B8=D0=BC=20=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=B3=D0=BE=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=B5=D1=82=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abonapp/models.py b/abonapp/models.py index 3e0fb45..01899cb 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -303,7 +303,7 @@ class Abon(UserProfile): # выберем следующую по приоритету # next_tarifs = AbonTariff.objects.filter(tariff_priority__gt = self.tariff_priority, abon=self.abon) next_tarifs = [tr for tr in ats if tr.tariff_priority > at.tariff_priority][:2] - #next_tarifs = filter(lambda tr: tr.tariff_priority > at.tariff_priority, ats)[:2] + # next_tarifs = filter(lambda tr: tr.tariff_priority > at.tariff_priority, ats)[:2] # и если что-нибудь из списка следующих услуг вернулось - то активируем if len(next_tarifs) > 0: @@ -332,10 +332,10 @@ class Abon(UserProfile): else: return inst_tariff = self.active_tariff() - if inst_tariff: + if inst_tariff is not None: agent_trf = TariffStruct(inst_tariff.id, inst_tariff.speedIn, inst_tariff.speedOut) else: - agent_trf = TariffStruct() + agent_trf = None return AbonStruct(self.pk, user_ip, agent_trf, bool(self.is_active)) def save(self, *args, **kwargs):