Merge branch 'master' of github.com:nnrcschmdt/helsinki

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
 

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