Add Book.ancestor m2m.

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

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 8ed628e..d5cec2e 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -149,7 +149,6 @@ class BuildHtml(BuildEbook):
         if html_output:
             meta_tags = list(book.tags.filter(
                 category__in=('author', 'epoch', 'genre', 'kind')))
         if html_output:
             meta_tags = list(book.tags.filter(
                 category__in=('author', 'epoch', 'genre', 'kind')))

-            book_tag = book.book_tag()

 
             lang = book.language
             lang = LANGUAGES_3TO2.get(lang, lang)
 
             lang = book.language
             lang = LANGUAGES_3TO2.get(lang, lang)


@@ -162,13 +161,6 @@ class BuildHtml(BuildEbook):
                 fieldfile.field.attname: fieldfile
             })
 
                 fieldfile.field.attname: fieldfile
             })
 

-            # get ancestor l-tags for adding to new fragments
-            ancestor_tags = []
-            p = book.parent
-            while p:
-                ancestor_tags.append(p.book_tag())
-                p = p.parent
-

             # Extract fragments
             closed_fragments, open_fragments = html.extract_fragments(fieldfile.path)
             for fragment in closed_fragments.values():
             # Extract fragments
             closed_fragments, open_fragments = html.extract_fragments(fieldfile.path)
             for fragment in closed_fragments.values():


@@ -211,11 +203,9 @@ class BuildHtml(BuildEbook):
                         book=book, text=text, short_text=short_text)
 
                 new_fragment.save()
                         book=book, text=text, short_text=short_text)
 
                 new_fragment.save()

-                new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags)
-            book.fix_tree_tags()
+                new_fragment.tags = set(meta_tags + themes)

             book.html_built.send(sender=book)
             return True
             book.html_built.send(sender=book)
             return True

-        book.fix_tree_tags()

         return False
 
 @BuildEbook.register('cover_thumb')
         return False
 
 @BuildEbook.register('cover_thumb')