Test for parenthood by looking for children instead of HTML.

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index f85cfce..83bc040 100644 (file)
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -545,7 +545,7 @@ class Book(models.Model):
         """
         # get relevant books and their tags
         objects = cls.tagged.with_all(tags)
         """
         # get relevant books and their tags
         objects = cls.tagged.with_all(tags)

-        parents = objects.filter(html_file='').only('slug')
+        parents = objects.exclude(children=None).only('slug')

         # eliminate descendants
         l_tags = Tag.objects.filter(category='book',
             slug__in=[book.book_tag_slug() for book in parents.iterator()])
         # eliminate descendants
         l_tags = Tag.objects.filter(category='book',
             slug__in=[book.book_tag_slug() for book in parents.iterator()])

diff --git a/apps/reporting/templatetags/reporting_stats.py b/apps/reporting/templatetags/reporting_stats.py
index 6f20c08..ee9a7bf 100755 (executable)
--- a/apps/reporting/templatetags/reporting_stats.py
+++ b/apps/reporting/templatetags/reporting_stats.py
@@ -50,11 +50,11 @@ def count_books_all():
 
 @register_counter
 def count_books():
 
 @register_counter
 def count_books():

-    return Book.objects.exclude(html_file='').count()
+    return Book.objects.filter(children=None).count()

 
 @register_counter
 def count_books_parent():
 
 @register_counter
 def count_books_parent():

-    return Book.objects.filter(html_file='').count()
+    return Book.objects.exclude(children=None).count()

 
 @register_counter
 def count_books_root():
 
 @register_counter
 def count_books_root():