From 159324b3d3f3df8e7ae686721fd7a4d61e8b8a42 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 4 Aug 2016 17:03:48 +0300 Subject: [PATCH] =?UTF-8?q?1461:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=965:?= =?UTF-8?q?=20=D0=A4=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- events/forms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/events/forms.py b/events/forms.py index d4b62572..3e4afaf8 100644 --- a/events/forms.py +++ b/events/forms.py @@ -168,13 +168,13 @@ class FilterForm(forms.Form): self._lookup_kwargs['city_id__in'] = d.get('city') if d.get('members'): self._local_fields.append('members') - self._lookup_kwargs['members__in'] = d.get('members') + self._lookup_kwargs['members_choice__in'] = d.get('members') if d.get('visitors'): self._local_fields.append('visitors') - self._lookup_kwargs['visitors__in'] = d.get('visitors') + self._lookup_kwargs['visitors_choice__in'] = d.get('visitors') if d.get('price'): self._local_fields.append('price') - self._lookup_kwargs['price__in'] = d.get('price') + self._lookup_kwargs['price_choice__in'] = d.get('price') return self._lookup_kwargs # @property @@ -336,7 +336,7 @@ class FilterForm(forms.Form): mapper = namedtuple('Result', [col[0] for col in c.description]) data = [mapper(*raw) for raw in c.fetchall()] for key, val in _values_mapping: - count = sum([getattr(x, key, 0) for x in data]) + count = sum([getattr(x, key, 0) or 0 for x in data]) choices.append((val.get('value'), val.get('label') + ' ({count})'.format(count=count))) return choices