diff --git a/aircox/models.py b/aircox/models.py index 8a845e2..c1a0cc7 100755 --- a/aircox/models.py +++ b/aircox/models.py @@ -1351,7 +1351,6 @@ class LogQuerySet(models.QuerySet): logs = yaml.load(data) # we need to preload diffusions, sounds and tracks - # we get them all at once, in order to reduce db calls rels = { 'diffusion': self._get_rel_objects(logs, Diffusion, 'diffusion'), 'sound': self._get_rel_objects(logs, Sound, 'sound'), diff --git a/aircox_cms/models/__init__.py b/aircox_cms/models/__init__.py index b62322f..ede6bd7 100755 --- a/aircox_cms/models/__init__.py +++ b/aircox_cms/models/__init__.py @@ -811,8 +811,11 @@ class TimetablePage(DatedListPage): def get_queryset(self, request, context): diffs = [] for date in context['nav_dates']['dates']: - items = aircox.models.Diffusion.objects.at(self.station, date) - items = [ DiffusionPage.as_item(item) for item in items ] + items = [ + DiffusionPage.as_item(item) + for item in aircox.models.Diffusion.objects \ + .station(self.station).at(date) + ] diffs.append((date, items)) return diffs diff --git a/aircox_cms/models/sections.py b/aircox_cms/models/sections.py index 57896ab..4a4c143 100644 --- a/aircox_cms/models/sections.py +++ b/aircox_cms/models/sections.py @@ -489,8 +489,11 @@ class SectionTimetable(Section,DatedBaseList): from aircox_cms.models import DiffusionPage diffs = [] for date in context['nav_dates']['dates']: - items = aircox.models.Diffusion.objects.at(self.station, date) - items = [ DiffusionPage.as_item(item) for item in items ] + items = [ + DiffusionPage.as_item(item) + for item in aircox.models.Diffusion.objects \ + .station(self.station).at(date) + ] diffs.append((date, items)) return diffs diff --git a/aircox_cms/templates/aircox_cms/snippets/date_list.html b/aircox_cms/templates/aircox_cms/snippets/date_list.html index c3e4724..c98c9f7 100755 --- a/aircox_cms/templates/aircox_cms/snippets/date_list.html +++ b/aircox_cms/templates/aircox_cms/snippets/date_list.html @@ -5,7 +5,7 @@ {% if nav_dates.dates %}