changes from server

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

diff --git a/apps/pdcounter/views.py b/apps/pdcounter/views.py
index 8fb1b13..e5b4421 100644 (file)
--- a/apps/pdcounter/views.py
+++ b/apps/pdcounter/views.py
@@ -5,13 +5,16 @@
 from datetime import datetime
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404
 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 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)
 def book_stub_detail(request, slug):
     book = get_object_or_404(models.BookStub, slug=slug)

-    pd_counter = datetime(book.pd, 1, 1)
+    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)})
 
     form = PublishingSuggestForm(
             initial={"books": u"%s — %s, \n" % (book.author, book.title)})


@@ -20,9 +23,11 @@ def book_stub_detail(request, slug):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

+@cache.never_cache

 def author_detail(request, slug):
     author = get_object_or_404(models.Author, slug=slug)
 def author_detail(request, slug):
     author = get_object_or_404(models.Author, slug=slug)

-    pd_counter = datetime(author.goes_to_pd(), 1, 1)
+    if not author.alive():
+        pd_counter = datetime(author.goes_to_pd(), 1, 1)

 
     form = PublishingSuggestForm(initial={"books": author.name + ", \n"})
 
 
     form = PublishingSuggestForm(initial={"books": author.name + ", \n"})