Merge branch 'reflow'

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
deleted file mode 100644 (file)
index 3f04e3c..0000000
--- a/apps/picture/views.py
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-
-
-def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
-    """ generates a listing of all books, optionally filtered with a test function """
-
-    pictures_by_author, orphans = Picture.picture_list()
-    books_nav = SortedDict()
-    for tag in pictures_by_author:
-        if pictures_by_author[tag]:
-            books_nav.setdefault(tag.sort_key[0], []).append(tag)
-
-            #    import pdb; pdb.set_trace()
-    return render_to_response(template_name, locals(),
-        context_instance=RequestContext(request))
-
-
-def picture_detail(request, picture):
-    picture = get_object_or_404(Picture, slug=picture)
-
-    categories = SortedDict()
-    for tag in picture.tags.iterator():
-        categories.setdefault(tag.category, []).append(tag)
-
-    picture_themes = []
-
-    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)