X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3438c79639fca7268c397dd3fcfdcf9ca5014a09..1ca6872afcca0bb6fb4c0c11fdad3b760a2362a1:/apps/picture/views.py diff --git a/apps/picture/views.py b/apps/picture/views.py index 105f6b863..dcc380713 100644 --- a/apps/picture/views.py +++ b/apps/picture/views.py @@ -1,35 +1,74 @@ -from catalogue import forms -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.core.paginator import Paginator +from picture.models import Picture 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: 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): - form = forms.SearchForm() - picture = get_object_or_404(Picture, slug=picture) +def picture_list_thumb(request, filter=None, template_name='picture/picture_list_thumb.html'): + picture_list = Picture.objects.all() + return render_to_response(template_name, locals(), + context_instance=RequestContext(request)) + +def picture_detail(request, slug): + picture = get_object_or_404(Picture, slug=slug) 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(), + return render_to_response("picture/picture_detail.html", locals(), context_instance=RequestContext(request)) + + +def picture_viewer(request, slug): + picture = get_object_or_404(Picture, slug=slug) + + return render_to_response("picture/picture_viewer.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) + +