From 4b0bde340782067739463cd7a24dc2f1759ffe72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Mon, 17 Oct 2016 00:49:22 +0200 Subject: [PATCH] room: show only accepted and pending talks --- planning/models.py | 8 ++++++-- planning/templates/planning/room_list.html | 2 +- planning/views.py | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/planning/models.py b/planning/models.py index d04afc6..d97e80d 100644 --- a/planning/models.py +++ b/planning/models.py @@ -24,10 +24,14 @@ class Room(models.Model): def get_absolute_url(self): return reverse('list-rooms') + @property + def talks(self): + return self.talk_set.exclude(accepted=False) + @property def talks_by_date(self): - return self.talk_set.filter(start_date__isnull=False).order_by('start_date').all() + return self.talks.filter(start_date__isnull=False).order_by('start_date').all() @property def unscheduled_talks(self): - return self.talk_set.filter(start_date__isnull=True).all() + return self.talks.filter(start_date__isnull=True).all() diff --git a/planning/templates/planning/room_list.html b/planning/templates/planning/room_list.html index 07d6469..d5ece9e 100644 --- a/planning/templates/planning/room_list.html +++ b/planning/templates/planning/room_list.html @@ -21,7 +21,7 @@ {{ room.capacity }} {% trans "place" %}{{ room.capacity|pluralize }} {% if request|staff %} | - {{ room.talk_set.count }} {% trans "talk" %}{{ room.talk_set.count|pluralize }} + {{ room.talks.count }} {% trans "talk" %}{{ room.talks.count|pluralize }} {% if request|orga %} | {% bootstrap_icon "pencil" %} diff --git a/planning/views.py b/planning/views.py index d77b148..d593885 100644 --- a/planning/views.py +++ b/planning/views.py @@ -12,6 +12,7 @@ from .models import Room from .forms import RoomForm from .utils import Program + class RoomMixin(object): def get_queryset(self): return Room.objects.filter(site=get_current_site(self.request)).all()