Minor fixes in picture publishing process.

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 4bc2ab0..1f87386 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -9,6 +9,7 @@ from django.template import RequestContext
 from picture.models import Picture, PictureArea
 from catalogue.utils import split_tags
 from ssify import ssi_included
 from picture.models import Picture, PictureArea
 from catalogue.utils import split_tags
 from ssify import ssi_included

+from sponsors.models import Sponsor

 
 # was picture/picture_list.html list (without thumbs)
 def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html', cache_key=None, context=None):
 
 # was picture/picture_list.html list (without thumbs)
 def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html', cache_key=None, context=None):


@@ -57,6 +58,11 @@ def picture_detail(request, slug):
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)

+    sponsors = []
+    for sponsor in picture.extra_info.get('sponsors', []):
+        have_sponsors = Sponsor.objects.filter(name=sponsor)
+        if have_sponsors.exists():
+            sponsors.append(have_sponsors[0])

     return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))
 


@@ -88,6 +94,18 @@ def import_picture(request):
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
 
 
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
 
 

+@ssi_included
+def picture_mini(request, pk, with_link=True):
+    picture = get_object_or_404(Picture, pk=pk)
+    author_str = ", ".join(tag.name
+        for tag in picture.tags.filter(category='author'))
+    return render(request, 'picture/picture_mini_box.html', {
+        'picture': picture,
+        'author_str': author_str,
+        'with_link': with_link,
+    })
+
+

 @ssi_included
 def picture_short(request, pk):
     picture = get_object_or_404(Picture, pk=pk)
 @ssi_included
 def picture_short(request, pk):
     picture = get_object_or_404(Picture, pk=pk)