From 7d11a440c69089bef80cbd42e9e8ef8ead49e26e Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 4 May 2022 10:28:34 +0530 Subject: [PATCH] Also filter entries by expire_at in the news section of the home page --- publichealth/home/models/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py index 7853dd2..de655aa 100644 --- a/publichealth/home/models/models.py +++ b/publichealth/home/models/models.py @@ -2,6 +2,8 @@ from __future__ import unicode_literals +import datetime + from django.db import models from django.utils import translation from django.conf import settings @@ -320,7 +322,9 @@ class HomePage(Page): @property def newsentries(self): # Get the last few news entries for the home page - entries = Entry.objects.all().order_by('-published') + entries = Entry.objects.filter( + models.Q(expire_at__isnull=True) | models.Q(expire_at__gt=datetime.datetime.now()) + ).all().order_by('-published') # Filter out by current language curlang = translation.get_language() if curlang in ['de']: