New layout pages.

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

diff --git a/src/picture/views.py b/src/picture/views.py
index 6345f20..e40e0ab 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -17,7 +17,7 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         pictures = pictures.filter(filter)
     if get_filter:
         pictures = pictures.filter(get_filter())
         pictures = pictures.filter(filter)
     if get_filter:
         pictures = pictures.filter(get_filter())

-    return render(request, template_name, {'book_list': list(pictures)})
+    return render(request, template_name, {'picture_list': list(pictures)})

 
 
 def picture_detail(request, slug):
 
 
 def picture_detail(request, slug):


@@ -36,7 +36,7 @@ def picture_detail(request, slug):
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
     sponsors = []
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
     sponsors = []

-    for sponsor in picture.extra_info.get('sponsors', []):
+    for sponsor in picture.get_extra_info_json().get('sponsors', []):

         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])
         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])


@@ -60,7 +60,7 @@ def picture_page(request, key=None):
             'epoch': picture.tag_unicode('epoch'),
             'kind': picture.tag_unicode('kind'),
             'genre': picture.tag_unicode('genre'),
             'epoch': picture.tag_unicode('epoch'),
             'kind': picture.tag_unicode('kind'),
             'genre': picture.tag_unicode('genre'),

-            'style': picture.extra_info['style'],
+            'style': picture.get_extra_info_json()['style'],

             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,
             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,


@@ -95,7 +95,7 @@ def import_picture(request):
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %

-                                {'exception': exception, 'tb': tb}, mimetype='text/plain')
+                                {'exception': exception, 'tb': tb}, content_type='text/plain')

         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)