diff options
| author | Johannes Raggam <raggam-nl@adm.at> | 2011-05-12 16:53:10 (GMT) |
|---|---|---|
| committer | Johannes Raggam <raggam-nl@adm.at> | 2011-05-12 16:53:10 (GMT) |
| commit | 3a0cc2445028a11d760df6b038c8a812373e0a07 (patch) | |
| tree | e96d61c1a96931fe71997785d7e3a2a92d84dcf5 | |
| parent | 2227198dfa0857942e365aab54836b8859781e0d (diff) | |
| parent | 57017520ea977c97aa5af3c83fc040c613f7cedd (diff) | |
Merge branch 'master' of github.com:nnrcschmdt/helsinki
| -rw-r--r-- | program/views.py | 12 | ||||
| -rw-r--r-- | requirements.txt | 4 |
2 files changed, 14 insertions, 2 deletions
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 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 |