minor fix

[wolnelektury.git] / src / picture / models.py

diff --git a/src/picture/models.py b/src/picture/models.py
index dec9960..fc659ba 100644 (file)
--- a/src/picture/models.py
+++ b/src/picture/models.py
@@ -12,7 +12,6 @@ from slugify import slugify
 
 from catalogue.models.tag import prefetched_relations
 from catalogue.utils import split_tags
 
 from catalogue.models.tag import prefetched_relations
 from catalogue.utils import split_tags

-from picture import tasks

 from wolnelektury.utils import cached_render, clear_cached_renders
 from io import BytesIO
 import itertools
 from wolnelektury.utils import cached_render, clear_cached_renders
 from io import BytesIO
 import itertools


@@ -202,7 +201,7 @@ class Picture(models.Model):
             picture.title = str(picture_xml.picture_info.title)
             picture.extra_info = json.dumps(picture_xml.picture_info.to_dict())
 
             picture.title = str(picture_xml.picture_info.title)
             picture.extra_info = json.dumps(picture_xml.picture_info.to_dict())
 

-            picture_tags = set(catalogue.models.Tag.tags_from_info(picture_xml.picture_info))
+            picture_tags = set([t for (t, rel) in catalogue.models.Tag.tags_from_info(picture_xml.picture_info)])

             for tag in picture_tags:
                 if not tag.for_pictures:
                     tag.for_pictures = True
             for tag in picture_tags:
                 if not tag.for_pictures:
                     tag.for_pictures = True


@@ -291,7 +290,6 @@ class Picture(models.Model):
 
             picture.xml_file.save("%s.xml" % picture.slug, File(xml_file))
             picture.save()
 
             picture.xml_file.save("%s.xml" % picture.slug, File(xml_file))
             picture.save()

-            tasks.generate_picture_html(picture.id)

 
         if close_xml_file:
             xml_file.close()
 
         if close_xml_file:
             xml_file.close()