Using cache middleware instead of various caching micro-strategies,

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

diff --git a/apps/pdcounter/views.py b/apps/pdcounter/views.py
index b07ee11..e5b4421 100644 (file)
--- a/apps/pdcounter/views.py
+++ b/apps/pdcounter/views.py
@@ -2,17 +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 django.views.decorators import cache
 from suggest.forms import PublishingSuggestForm
+from . import models
 
 
+@cache.never_cache
 def book_stub_detail(request, slug):
     book = get_object_or_404(models.BookStub, slug=slug)
-    pd_counter = book.pd
+    if book.pd and not book.in_pd():
+        pd_counter = datetime(book.pd, 1, 1)
 
     form = PublishingSuggestForm(
             initial={"books": u"%s — %s, \n" % (book.author, book.title)})
@@ -21,9 +23,11 @@ def book_stub_detail(request, slug):
         context_instance=RequestContext(request))
 
 
+@cache.never_cache
 def author_detail(request, slug):
     author = get_object_or_404(models.Author, slug=slug)
-    pd_counter = author.goes_to_pd()
+    if not author.alive():
+        pd_counter = datetime(author.goes_to_pd(), 1, 1)
 
     form = PublishingSuggestForm(initial={"books": author.name + ", \n"})