From 9cd8e35f39917b2da005a16586d16cf1d018576e Mon Sep 17 00:00:00 2001 From: Alexander Burdeinyi Date: Fri, 9 Dec 2016 16:11:50 +0200 Subject: [PATCH] m --- emencia/django/newsletter/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index f3d9a551..1b0f6fb8 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -282,13 +282,13 @@ class Contact(models.Model): # russia if self.russia: - r_cities = set(self.r_cities.values_list('pk', flat=True)) + r_cities = set(self.r_cities.exclude(pk=settings.MOSCOW_PK).values_list('pk', flat=True)) r_date = date + relativedelta.relativedelta(months=1) russia_sqs = SearchQuerySet().models(Exposition, Conference) \ .filter(country_id=Exact(settings.RUSSIA_PK), data_begin__gte=r_date) \ # .exclude(city_id=Exact(settings.MOSCOW_PK)) - if r_cities or self.moscow: - russia_sqs = russia_sqs.exclude(city_id=Exact(settings.MOSCOW_PK)) + # if r_cities or self.moscow: + # russia_sqs = russia_sqs.exclude(city_id=Exact(settings.MOSCOW_PK)) if r_cities: russia_sqs = russia_sqs.filter(city_id__in=r_cities) if th_tg_filter is not None: