From cf1bb0a88cd47202c322ea985b786281354576ec Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 1/2] Remove doubles --- apps/tag/filters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/tag/filters.py b/apps/tag/filters.py index 84a25528..2dc3a775 100644 --- a/apps/tag/filters.py +++ b/apps/tag/filters.py @@ -64,7 +64,8 @@ class TagsFilterSet(TagsBaseFilterSet): return super().filter_by_type(queryset, name, value) queryset = models.Tag.objects 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: - 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 \ No newline at end of file From 4dd06f772f4473840b26444bbd23c510ac2b7b44 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 2/2] Use old ids for demonstration --- apps/news/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/news/views.py b/apps/news/views.py index ad7e6dfb..990665dd 100644 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -37,7 +37,7 @@ class NewsMixinView: qs = qs.by_country_code(country_code) else: qs = models.News.objects.filter( - id__in=settings.HARDCODED_INTERNATIONAL_NEWS_IDS) + old_id__in=settings.HARDCODED_INTERNATIONAL_NEWS_IDS) return qs # temp code