X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/60b06883b6d5a336ef47c01103ec1ce25aafae69..c48556c444d6ead2372138a18c11ee21f29e7be5:/apps/pdcounter/views.py?ds=inline

diff --git a/apps/pdcounter/views.py b/apps/pdcounter/views.py
index efcfe95ee..3e2092e47 100644
--- a/apps/pdcounter/views.py
+++ b/apps/pdcounter/views.py
@@ -2,21 +2,19 @@
 # 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 datetime import datetime
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404
 from pdcounter import models
-from catalogue import forms
 from suggest.forms import PublishingSuggestForm
 
 
 def book_stub_detail(request, slug):
     book = get_object_or_404(models.BookStub, slug=slug)
-    pd_counter = book.pd
-    form = forms.SearchForm()
+    if book.pd and not book.in_pd():
+        pd_counter = datetime(book.pd, 1, 1)
 
-    pubsuggest_form = PublishingSuggestForm(
+    form = PublishingSuggestForm(
             initial={"books": u"%s — %s, \n" % (book.author, book.title)})
 
     return render_to_response('pdcounter/book_stub_detail.html', locals(),
@@ -25,10 +23,10 @@ def book_stub_detail(request, slug):
 
 def author_detail(request, slug):
     author = get_object_or_404(models.Author, slug=slug)
-    pd_counter = author.goes_to_pd()
-    form = forms.SearchForm()
+    if not author.alive():
+        pd_counter = datetime(author.goes_to_pd(), 1, 1)
 
-    pubsuggest_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))