Show children books in sets if they were explicitly added.

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 257d472..f574c13 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -79,7 +79,7 @@ def tagged_object_list(request, tags=''):
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 

-    if not theme_is_set:
+    if not (theme_is_set or shelf_is_set):

         model=models.Book.objects.filter(parent=None)
     
     return newtagging_views.tagged_object_list(
         model=models.Book.objects.filter(parent=None)
     
     return newtagging_views.tagged_object_list(