X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f59e7c3de6bd0f85a61a4d9481db60cd7369ae92..010d715dad6709bf4f67e3b04e3f669fed45bb56:/apps/picture/views.py?ds=sidebyside diff --git a/apps/picture/views.py b/apps/picture/views.py index c5be3bea3..3f04e3c89 100644 --- a/apps/picture/views.py +++ b/apps/picture/views.py @@ -1,4 +1,5 @@ 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 @@ -22,10 +23,36 @@ def picture_detail(request, picture): picture = get_object_or_404(Picture, slug=picture) categories = SortedDict() - for tag in picture.tags: + 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)