X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/08433423130c027b64c87c13c1bb4d2390694263..ad39c2501159fa52e980c95af3e735e36b459c15:/apps/catalogue/fields.py?ds=inline diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py index 8ed628e0e..884ecef8d 100644 --- 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'))) - book_tag = book.book_tag() lang = book.language lang = LANGUAGES_3TO2.get(lang, lang) @@ -162,13 +161,6 @@ class BuildHtml(BuildEbook): 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(): @@ -211,11 +203,9 @@ class BuildHtml(BuildEbook): 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() - book.html_built.send(sender=book) + new_fragment.tags = set(meta_tags + themes) + book.html_built.send(sender=type(self), instance=book) return True - book.fix_tree_tags() return False @BuildEbook.register('cover_thumb') @@ -245,19 +235,3 @@ class OverwritingFieldFile(FieldFile): class OverwritingFileField(models.FileField): attr_class = OverwritingFieldFile - - -try: - # check for south - from south.modelsinspector import add_introspection_rules -except ImportError: - pass -else: - add_introspection_rules([ - ( - [EbookField], - [], - {'format_name': ('format_name', {})} - ) - ], ["^catalogue\.fields\.EbookField"]) - add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])