|
|
|
@ -270,7 +270,7 @@ class Article(TranslatableModel): |
|
|
|
themes = self.theme.all().values_list('pk', flat=True) |
|
|
|
themes = self.theme.all().values_list('pk', flat=True) |
|
|
|
exclude_pks = set([self.pk]) |
|
|
|
exclude_pks = set([self.pk]) |
|
|
|
qs = model.objects.language()\ |
|
|
|
qs = model.objects.language()\ |
|
|
|
.filter(type=self.type, publish_date__isnull=False).distinct().order_by('-publish_date') |
|
|
|
.filter(type=self.type, draft=False, publish_date__isnull=False).distinct().order_by('-publish_date') |
|
|
|
tags_sim = qs.filter(tag__in=tags).exclude(pk__in=exclude_pks)[:4] |
|
|
|
tags_sim = qs.filter(tag__in=tags).exclude(pk__in=exclude_pks)[:4] |
|
|
|
exclude_pks.update([x.pk for x in tags_sim]) |
|
|
|
exclude_pks.update([x.pk for x in tags_sim]) |
|
|
|
themes_sim = qs.filter(theme__in=themes).exclude(pk__in=exclude_pks)[:4] |
|
|
|
themes_sim = qs.filter(theme__in=themes).exclude(pk__in=exclude_pks)[:4] |
|
|
|
|