slucha - 2 pliki jeszcze

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 57a4975..f1eeab7 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -31,7 +31,9 @@ from catalogue.tasks import touch_tag
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm

+from picture.models import Picture

 
 

+from itertools import chain

 from os import path
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 from os import path
 
 staff_required = user_passes_test(lambda user: user.is_staff)


@@ -88,6 +90,7 @@ def differentiate_tags(request, tags, ambiguous_slugs):
 
 
 def tagged_object_list(request, tags=''):
 
 
 def tagged_object_list(request, tags=''):

+    #    import pdb; pdb.set_trace()

     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:


@@ -166,6 +169,9 @@ def tagged_object_list(request, tags=''):
         only_author = len(tags) == 1 and tags[0].category == 'author'
         objects = models.Book.objects.none()
 
         only_author = len(tags) == 1 and tags[0].category == 'author'
         objects = models.Book.objects.none()
 

+        # Add pictures
+    objects = Picture.tagged.with_all(tags)|objects
+

     return object_list(
         request,
         objects,
     return object_list(
         request,
         objects,