|
|
|
|
@ -513,7 +513,7 @@ class FilterForm(forms.Form): |
|
|
|
|
# для того чтобы взяло чойсы из новых результатов |
|
|
|
|
self.fields[field].cache_choices = False |
|
|
|
|
self.fields[field].choice_cache = None |
|
|
|
|
print(self.fields[field].queryset.query) |
|
|
|
|
# print(self.fields[field].queryset.query) |
|
|
|
|
|
|
|
|
|
for field in ['members', 'visitors', 'price']: |
|
|
|
|
self.fields[field].choices = self.make_local_field_count(field) or self.fields[field].choices |
|
|
|
|
@ -1041,9 +1041,9 @@ class FilterForm(forms.Form): |
|
|
|
|
quality_label = [x['db_value'] for x in filter(lambda x: x['field'] != 'expohit' and x['value'] in self.cleaned_data.get('rating'), rating_mapping)] |
|
|
|
|
if quality_label: |
|
|
|
|
if params is None: |
|
|
|
|
params = SQ(**{'quality_label__in': quality_label}) |
|
|
|
|
params = SQ(**{'rating__in': quality_label}) |
|
|
|
|
else: |
|
|
|
|
params |= SQ(**{'quality_label__in': quality_label}) |
|
|
|
|
params |= SQ(**{'rating__in': quality_label}) |
|
|
|
|
return params |
|
|
|
|
|
|
|
|
|
def make_count_select(self, field): |
|
|
|
|
|