phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into amazon

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-11-04 15:38:45 +03:00
commit a1206e555e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/news/views.py
View File

@ -37,7 +37,7 @@ class NewsMixinView:
qs = qs.by_country_code(country_code) qs = qs.by_country_code(country_code)
else: else:
qs = models.News.objects.filter( qs = models.News.objects.filter(
id__in=settings.HARDCODED_INTERNATIONAL_NEWS_IDS) old_id__in=settings.HARDCODED_INTERNATIONAL_NEWS_IDS)
return qs return qs
# temp code # temp code

5
apps/tag/filters.py
View File

@ -64,7 +64,8 @@ class TagsFilterSet(TagsBaseFilterSet):
return super().filter_by_type(queryset, name, value) return super().filter_by_type(queryset, name, value)
queryset = models.Tag.objects queryset = models.Tag.objects
if self.NEWS in value: if self.NEWS in value:
queryset = queryset.for_news().filter(value__in=settings.NEWS_CHOSEN_TAGS) queryset = queryset.for_news().filter(value__in=settings.NEWS_CHOSEN_TAGS).distinct('value')
if self.ESTABLISHMENT in value: if self.ESTABLISHMENT in value:
queryset = queryset.for_establishments().filter(value__in=settings.ESTABLISHMENT_CHOSEN_TAGS) queryset = queryset.for_establishments().filter(value__in=settings.ESTABLISHMENT_CHOSEN_TAGS).distinct(
'value')
return queryset return queryset