1461: Этап №5: Фильтрация событий

fix

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