X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..d10c63f27d1494a04d57a6c805d093089526430a:/src/pdcounter/views.py diff --git a/src/pdcounter/views.py b/src/pdcounter/views.py index e5b4421ce..5e3f3be7c 100644 --- a/src/pdcounter/views.py +++ b/src/pdcounter/views.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from datetime import datetime -from django.template import RequestContext -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import render, get_object_or_404 from django.views.decorators import cache from suggest.forms import PublishingSuggestForm from . import models @@ -15,12 +13,16 @@ def book_stub_detail(request, slug): book = get_object_or_404(models.BookStub, slug=slug) if book.pd and not book.in_pd(): pd_counter = datetime(book.pd, 1, 1) + else: + pd_counter = None - form = PublishingSuggestForm( - initial={"books": u"%s — %s, \n" % (book.author, book.title)}) + form = PublishingSuggestForm(initial={"books": "%s — %s, \n" % (book.author, book.title)}) - return render_to_response('pdcounter/book_stub_detail.html', locals(), - context_instance=RequestContext(request)) + return render(request, 'pdcounter/book_stub_detail.html', { + 'book': book, + 'pd_counter': pd_counter, + 'form': form, + }) @cache.never_cache @@ -28,8 +30,13 @@ def author_detail(request, slug): author = get_object_or_404(models.Author, slug=slug) if not author.alive(): pd_counter = datetime(author.goes_to_pd(), 1, 1) + else: + pd_counter = None form = PublishingSuggestForm(initial={"books": author.name + ", \n"}) - return render_to_response('pdcounter/author_detail.html', locals(), - context_instance=RequestContext(request)) + return render(request, 'pdcounter/author_detail.html', { + 'author': author, + 'pd_counter': pd_counter, + 'form': form, + })