HTML generation in Celery.

[wolnelektury.git] / apps / picture / tasks.py

diff --git a/apps/picture/tasks.py b/apps/picture/tasks.py
index b823f26..fc9eafa 100644 (file)
--- a/apps/picture/tasks.py
+++ b/apps/picture/tasks.py
@@ -2,24 +2,19 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from datetime import datetime
-from traceback import print_exc

 from celery.task import task
 from celery.task import task

-from django.conf import settings
-import picture.models

 from django.core.files.base import ContentFile
 from django.template.loader import render_to_string
 from django.core.files.base import ContentFile
 from django.template.loader import render_to_string

-import librarian.picture

 
 
 @task
 def generate_picture_html(picture_id):
 
 
 @task
 def generate_picture_html(picture_id):

+    import picture.models

     pic = picture.models.Picture.objects.get(pk=picture_id)
 
     pic = picture.models.Picture.objects.get(pk=picture_id)
 

-    

     html_text = unicode(render_to_string('picture/picture_info.html', {
     html_text = unicode(render_to_string('picture/picture_info.html', {

-                'things': pic.areas['things'], 
-                'themes': pic.areas['themes'],
+                'things': pic.areas_json['things'],
+                'themes': pic.areas_json['themes'],

                 }))
     pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text))
 
                 }))
     pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text))