Add expire_at field to Entry model
This commit is contained in:
parent
d1a0c930eb
commit
4847b02c90
1 changed files with 10 additions and 2 deletions
|
@ -1,9 +1,10 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
import datetime
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import translation
|
from django.utils import translation
|
||||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
from wagtail.core.models import Page, Orderable
|
from wagtail.core.models import Page, Orderable
|
||||||
from wagtail.admin.edit_handlers import FieldPanel
|
from wagtail.admin.edit_handlers import FieldPanel
|
||||||
from wagtail.core.fields import RichTextField
|
from wagtail.core.fields import RichTextField
|
||||||
|
@ -39,6 +40,11 @@ class Entry(models.Model):
|
||||||
lang = models.CharField(max_length=2, blank=True, default='', choices=LANGUAGE_CHOICES)
|
lang = models.CharField(max_length=2, blank=True, default='', choices=LANGUAGE_CHOICES)
|
||||||
content = models.TextField()
|
content = models.TextField()
|
||||||
tags = models.TextField(blank=True)
|
tags = models.TextField(blank=True)
|
||||||
|
expire_at = models.DateTimeField(
|
||||||
|
verbose_name=_("expiry date/time"),
|
||||||
|
blank=True,
|
||||||
|
null=True
|
||||||
|
)
|
||||||
|
|
||||||
stream = models.ForeignKey(Stream,
|
stream = models.ForeignKey(Stream,
|
||||||
blank=False, on_delete=models.CASCADE,
|
blank=False, on_delete=models.CASCADE,
|
||||||
|
@ -68,7 +74,9 @@ class FeedPage(Page):
|
||||||
@property
|
@property
|
||||||
def feedentries(self):
|
def feedentries(self):
|
||||||
if self.stream:
|
if self.stream:
|
||||||
entries = Entry.objects.filter(stream=self.stream)
|
entries = Entry.objects.filter(stream=self.stream).filter(
|
||||||
|
models.Q(expire_at__isnull=True) | models.Q(expire_at__gt=datetime.datetime.now())
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
entries = Entry.objects.all()
|
entries = Entry.objects.all()
|
||||||
# Filter out by chosen language
|
# Filter out by chosen language
|
||||||
|
|
Loading…
Reference in a new issue