Merge branch 'production' into pretty

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 105f6b8..24457e2 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,5 +1,5 @@
-from catalogue import forms

 from picture.models import Picture
 from picture.models import Picture

+from django.contrib.auth.decorators import permission_required

 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext


@@ -8,8 +8,6 @@ from django.template import RequestContext
 def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 
 def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
     """ generates a listing of all books, optionally filtered with a test function """
 

-    form = forms.SearchForm()
-

     pictures_by_author, orphans = Picture.picture_list()
     books_nav = SortedDict()
     for tag in pictures_by_author:
     pictures_by_author, orphans = Picture.picture_list()
     books_nav = SortedDict()
     for tag in pictures_by_author:


@@ -22,7 +20,6 @@ def picture_list(request, filter=None, template_name='catalogue/picture_list.htm
 
 
 def picture_detail(request, picture):
 
 
 def picture_detail(request, picture):

-    form = forms.SearchForm()

     picture = get_object_or_404(Picture, slug=picture)
 
     categories = SortedDict()
     picture = get_object_or_404(Picture, slug=picture)
 
     categories = SortedDict()


@@ -33,3 +30,29 @@ def picture_detail(request, picture):
 
     return render_to_response("catalogue/picture_detail.html", locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response("catalogue/picture_detail.html", locals(),
                               context_instance=RequestContext(request))

+
+# =========
+# = Admin =
+# =========
+@permission_required('picture.add_picture')
+def import_picture(request):
+    """docstring for import_book"""
+    from django.http import HttpResponse
+    from picture.forms import PictureImportForm
+    from django.utils.translation import ugettext as _
+
+    import_form = PictureImportForm(request.POST, request.FILES)
+    if import_form.is_valid():
+        try:
+            import_form.save()
+        except:
+            import sys
+            import pprint
+            import traceback
+            info = sys.exc_info()
+            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')
+        return HttpResponse(_("Picture imported successfully"))
+    else:
+        return HttpResponse(_("Error importing file: %r") % import_form.errors)