End of news may be None

This commit is contained in:
evgeniy-st 2019-09-23 17:17:42 +03:00
parent fd265a397b
commit b4320ab4a6
2 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-23 14:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('news', '0011_auto_20190923_1134'),
]
operations = [
migrations.AlterField(
model_name='news',
name='end',
field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='End'),
),
]

View File

@ -37,7 +37,9 @@ class NewsQuerySet(models.QuerySet):
def published(self):
"""Return only published news"""
now = timezone.now()
return self.filter(is_publish=True, start__lte=now, end__gte=now)
return self.filter(models.Q(models.Q(end__gte=now) |
models.Q(end__isnull=True)),
is_publish=True, start__lte=now)
def with_related(self):
"""Return qs with related objects."""
@ -59,7 +61,8 @@ class News(BaseAttributes, TranslatedFieldsMixin):
verbose_name=_('description'),
help_text='{"en-GB":"some text"}')
start = models.DateTimeField(verbose_name=_('Start'))
end = models.DateTimeField(verbose_name=_('End'))
end = models.DateTimeField(blank=True, null=True, default=None,
verbose_name=_('End'))
playlist = models.IntegerField(_('playlist'))
is_publish = models.BooleanField(default=False,
verbose_name=_('Publish status'))