From 0453f86bc62355f630048930b5fcb3c3a7f2db0e Mon Sep 17 00:00:00 2001
From: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>
Date: Wed, 11 May 2011 22:01:39 +0200
Subject: updated requirements.


diff --git a/requirements.txt b/requirements.txt
index 4cd78de..d3695c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Django==1.2.5
 MySQL-python==1.2.3
 PIL==1.1.7
 PyYAML==3.09
-django-haystack==1.1.0
-django-tinymce==1.5.1a1
+django-haystack==1.2.0
+django-tinymce==1.5.1a2
 pysolr==2.0.13
 python-dateutil==1.5
-- 
cgit v0.10.2


From 57017520ea977c97aa5af3c83fc040c613f7cedd Mon Sep 17 00:00:00 2001
From: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>
Date: Wed, 11 May 2011 22:42:51 +0200
Subject: fixed filtering in day view.


diff --git a/program/views.py b/program/views.py
index 52f7355..54630a1 100644
--- a/program/views.py
+++ b/program/views.py
@@ -55,6 +55,18 @@ def day_schedule(request, year=None, month=None, day=None):
         broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat'])
 
         extra_context['timeslots'] = timeslots.filter(show__broadcastformat=broadcastformat)
+    elif 'musicfocus' in request.GET:
+        musicfocus = get_object_or_404(MusicFocus, slug=request.GET['musicfocus'])
+
+        extra_context['timeslots'] = timeslots.filter(show__musicfocus=musicfocus)
+    elif 'showinformation' in request.GET:
+        showinformation = get_object_or_404(ShowInformation, slug=request.GET['showinformation'])
+
+        extra_context['timeslots'] = timeslots.filter(show__showinformation=showinformation)
+    elif 'showtopic' in request.GET:
+        showtopic = get_object_or_404(ShowTopic, slug=request.GET['showtopic'])
+
+        extra_context['showtopic'] = timeslots.filter(show__showtopic=showtopic)
     else:
         extra_context['timeslots'] = timeslots
 
-- 
cgit v0.10.2