diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-05-27 19:37:28 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-05-27 19:37:28 (GMT) |
commit | 66a8d7ec50ac949d0cc3b14f9d76f35eb4f4d553 (patch) | |
tree | 15af15aa9c995f295cfe9a74701127a16e8b8a88 /program/views.py | |
parent | 11bf1e04f7814722ce27fc6a7dab194c68c1ca5f (diff) | |
parent | a1487772e667436e2274dece86cb40d2e58632a7 (diff) |
merged stable into master
Diffstat (limited to 'program/views.py')
-rw-r--r-- | program/views.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/views.py b/program/views.py index b4c2e8c..5dc82dd 100644 --- a/program/views.py +++ b/program/views.py @@ -50,7 +50,7 @@ class ShowListView(ListView): class ShowDetailView(DetailView): - queryset = Show.objects.filter(is_active=True).exclude(id=1).distinct() + queryset = Show.objects.all().exclude(id=1) template_name = 'show_detail.html' @@ -205,6 +205,7 @@ def json_day_schedule(request, year=None, month=None, day=None): 'id': ts.programslot.show.id, 'automation-id': -1 } + if ts.programslot.automation_id: entry['automation-id'] = ts.programslot.automation_id elif ts.programslot.show.automation_id: |