fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locale
[wolnelektury.git]
/
src
/
picture
/
tasks.py
diff --git
a/src/picture/tasks.py
b/src/picture/tasks.py
index
e80b0fc
..
e815f19
100644
(file)
--- a/
src/picture/tasks.py
+++ b/
src/picture/tasks.py
@@
-1,7
+1,7
@@
-# -*- coding: utf-8 -*-
# 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.
#
+import json
from traceback import print_exc
from celery.task import task
from traceback import print_exc
from celery.task import task
@@
-13,10
+13,11
@@
from django.template.loader import render_to_string
def generate_picture_html(picture_id):
import picture.models
pic = picture.models.Picture.objects.get(pk=picture_id)
def generate_picture_html(picture_id):
import picture.models
pic = picture.models.Picture.objects.get(pk=picture_id)
+ areas_json = json.loads(pic.areas_json)
html_text = render_to_string('picture/picture_info.html', {
html_text = render_to_string('picture/picture_info.html', {
- 'things':
pic.
areas_json['things'],
- 'themes':
pic.
areas_json['themes'],
+ 'things': areas_json['things'],
+ 'themes': 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))