Merge branch 'master' into funding

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

diff --git a/apps/pdcounter/views.py b/apps/pdcounter/views.py
index fa32909..8fb1b13 100644 (file)
--- a/apps/pdcounter/views.py
+++ b/apps/pdcounter/views.py
@@ -2,18 +2,19 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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.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)
 
 
 def book_stub_detail(request, slug):
     book = get_object_or_404(models.BookStub, slug=slug)

-    pd_counter = book.pd
-    form = forms.SearchForm()
+    pd_counter = datetime(book.pd, 1, 1)
+
+    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_to_response('pdcounter/book_stub_detail.html', locals(),
         context_instance=RequestContext(request))


@@ -21,8 +22,9 @@ def book_stub_detail(request, slug):
 
 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 = author.goes_to_pd()
-    form = forms.SearchForm()
+    pd_counter = datetime(author.goes_to_pd(), 1, 1)
+
+    form = PublishingSuggestForm(initial={"books": author.name + ", \n"})

 
     return render_to_response('pdcounter/author_detail.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('pdcounter/author_detail.html', locals(),
         context_instance=RequestContext(request))