From: Lukasz <lukasz@anwajler.com>
Date: Tue, 11 May 2010 13:38:25 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/aff5def884b3e0aeaafd7de454b68b4daa2c4f3d?hp=8de917b335927dacfa0815a016ee17b638969ab9

Merge branch 'master' of github.com/fnp/wolnelektury
---

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index fd0174f99..7cbba2748 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -206,14 +206,16 @@ def _tags_starting_with(prefix, user):
 def search(request):
     tags = request.GET.get('tags', '')
     prefix = request.GET.get('q', '')
-    # Prefix must have at least 2 characters
-    if len(prefix) < 2:
-        return HttpResponse('')
     
     try:
         tag_list = models.Tag.get_tag_list(tags)
     except:
         tag_list = []
+
+    # Prefix must have at least 2 characters
+    if len(prefix) < 2:
+        return render_to_response('catalogue/search_no_hits.html', {'query':prefix, 'tags':tag_list},
+            context_instance=RequestContext(request))
     
     result = _tags_starting_with(prefix, request.user)
     if len(result) > 0:
diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 6b36c955c..c249fa5a9 100644
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -43,7 +43,9 @@
                 <div id="czytamy-sluchajac-info">
                     <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="/static/img/czytamysluchajac-logo-small.png" /></a>     
                     <p>{% trans "Artist" %}: {{ book.get_extra_info_value.artist_name }}</p>
-                    <p>{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}</p>
+					{% if book.get_extra_info_value.director_name %}
+                        <p>{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}</p>
+					{% endif %}
                 </div>
             {% endif %}
             {% if book.mp3_file %}<a href="{{ book.mp3_file.url }}">{% trans "Download MP3" %}</a>{% endif %}