Django 2.0

[wolnelektury.git] / src / pdcounter / views.py

diff --git a/src/pdcounter/views.py b/src/pdcounter/views.py
index eee6bfc..3be24c0 100644 (file)
--- a/src/pdcounter/views.py
+++ b/src/pdcounter/views.py
@@ -3,8 +3,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import datetime
 # 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
 from django.views.decorators import cache
 from suggest.forms import PublishingSuggestForm
 from . import models


@@ -15,10 +14,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)
     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": u"%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
 
 
 @cache.never_cache


@@ -26,7 +31,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)
     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"})
 
 
     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,
+    })