forked from AFPy/PonyConf
consider talk with zero duration as unscheduled
This commit is contained in:
parent
dcc13c9cff
commit
b86196ca91
|
@ -2,6 +2,7 @@ from django.db import models
|
||||||
|
|
||||||
from django.contrib.sites.models import Site
|
from django.contrib.sites.models import Site
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
|
from django.db.models import Q
|
||||||
|
|
||||||
from autoslug import AutoSlugField
|
from autoslug import AutoSlugField
|
||||||
|
|
||||||
|
@ -30,8 +31,8 @@ class Room(models.Model):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def talks_by_date(self):
|
def talks_by_date(self):
|
||||||
return self.talks.filter(start_date__isnull=False).order_by('start_date').all()
|
return self.talks.filter(start_date__isnull=False).exclude(Q(duration=0) | Q(event__duration=0)).order_by('start_date').all()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def unscheduled_talks(self):
|
def unscheduled_talks(self):
|
||||||
return self.talks.filter(start_date__isnull=True).all()
|
return self.talks.filter(Q(start_date__isnull=True) | Q(duration=0, event__duration=0)).all()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user